diff --git a/po/be.po b/po/be.po
index 3d81d37dc..e3bc9c8e3 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -20,68 +20,68 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -91,81 +91,81 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "Увядзіце пароль\n"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
@@ -299,7 +299,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -310,257 +310,257 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Калі ласка, паведамляйце пра памылкі на <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -577,8 +577,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -586,8 +586,8 @@ msgstr ""
 "@Загады:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -598,88 +598,88 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr ""
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "памылка чытаньня файла"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -691,19 +691,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -725,11 +725,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -795,39 +795,39 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -1060,6 +1060,11 @@ msgstr "Для \"%s\" даведка адсутнічае"
 msgid "ignoring garbage line"
 msgstr ""
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "невядомая вэрсыя"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1164,7 +1169,7 @@ msgstr ""
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "сакрэтны ключ недаступны"
@@ -1174,8 +1179,8 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -1183,164 +1188,164 @@ msgstr ""
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr ""
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr ""
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr ""
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "непадтрымліваецца"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr ""
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr ""
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr ""
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1348,137 +1353,137 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr ""
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr ""
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "невядомы альгарытм сьцісканьня"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr ""
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr ""
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Даведка адсутнічае"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr ""
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "за шмат пераваг для \"%c\"\n"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Загад> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -1486,7 +1491,7 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
@@ -1786,37 +1791,37 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[файл]|зрабіць чысты тэкставы подпіс"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "зрабіць адчэплены подпіс"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "зашыфраваць даньні"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "шыфраваньне толькі сымэтрычнымі шыфрамі"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "разшыфраваць даньні (дапомна)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "праверыць подпіс"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "паказаць сьпіс ключоў"
 
@@ -1829,11 +1834,11 @@ msgstr "паказаць сьпіс ключоў і подпісаў"
 msgid "list and check key signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "паказаць сакрэтныя ключы"
 
@@ -1841,7 +1846,7 @@ msgstr "паказаць сакрэтныя ключы"
 msgid "generate a new key pair"
 msgstr "стварыць новую пару ключоў"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
@@ -1869,11 +1874,11 @@ msgstr ""
 msgid "export keys"
 msgstr "экспарт ключоў"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
@@ -1909,20 +1914,20 @@ msgstr ""
 msgid "print message digests"
 msgstr ""
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr ""
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 
@@ -1934,11 +1939,11 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr ""
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr ""
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не рабіць ніякіх зьменаў"
 
@@ -1950,7 +1955,7 @@ msgstr "пытацца перад перазапісам"
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1958,7 +1963,7 @@ msgstr ""
 "@\n"
 "(Глядзіце man старонку, для больш поўнага апісаньня ўсіх загадаў і выбараў)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1996,7 +2001,7 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2024,7 +2029,7 @@ msgstr ""
 msgid "usage: gpg [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "несумяшчальныя загады\n"
 
@@ -2100,451 +2105,451 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr ""
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr ""
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
-msgid "show preferred keyserver URLs during signature verification"
-msgstr ""
-
-#: g10/gpg.c:2674
-#, fuzzy
-msgid "show user ID validity during signature verification"
-msgstr "%s - гэта недапушчальнае мноства знакаў\n"
-
 #: g10/gpg.c:2676
-msgid "show revoked and expired user IDs in signature verification"
+msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
 #: g10/gpg.c:2678
 #, fuzzy
-msgid "show only the primary user ID in signature verification"
+msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
 #: g10/gpg.c:2680
-msgid "validate signatures with PKA data"
+msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
 #: g10/gpg.c:2682
+#, fuzzy
+msgid "show only the primary user ID in signature verification"
+msgstr "%s - гэта недапушчальнае мноства знакаў\n"
+
+#: g10/gpg.c:2684
+msgid "validate signatures with PKA data"
+msgstr ""
+
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3154
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3156
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2557,7 +2562,7 @@ msgstr "выдаліць ключы са зьвязку грамадскіх к
 msgid "make timestamp conflicts only a warning"
 msgstr ""
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr ""
 
@@ -3308,20 +3313,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
@@ -3338,7 +3343,7 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
@@ -4095,12 +4100,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
@@ -4170,76 +4175,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1657
 #, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr ""
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr ""
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr ""
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr ""
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr ""
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr ""
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr ""
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr ""
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr ""
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr ""
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr ""
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr ""
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4249,7 +4259,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4259,48 +4269,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4311,7 +4321,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4321,44 +4331,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4366,7 +4376,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4381,34 +4391,43 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2105
+#: g10/keygen.c:2145
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
+"\n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4416,7 +4435,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4424,91 +4443,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5033,66 +5052,66 @@ msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr ""
 "па больш падрабязныя зьвесткі шукайце на http://www.gnupg.org/faq.html\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr ""
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "невядомая вэрсыя"
@@ -5135,26 +5154,26 @@ msgstr ""
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5167,25 +5186,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-бітавы %s ключ, ID %08lX, створаны %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Увядзіце пароль\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "скасавана карыстальнікам\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "непадтрымліваецца"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5195,12 +5209,12 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6299,6 +6313,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "непадтрымліваецца"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6391,19 +6410,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6452,7 +6471,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -6472,15 +6491,15 @@ msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6499,149 +6518,148 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -6657,61 +6675,61 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr ""
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "несумяшчальныя загады\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -6818,7 +6836,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
@@ -7274,146 +7292,146 @@ msgstr ""
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr ""
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "дрэнны сэртыфікат"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "дрэнны пароль"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr ""
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "выдаліць ключы са зьвязку грамадскіх ключоў"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|НАЗВА|     задаць назву дапомнага сакрэтнага ключа"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ВУЗЕЛ|     выкарыстоўваць гэты паслужнік для пошуку ключоў"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ІМЯ|   зашыфраваць для вылучанай асобы"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7424,60 +7442,56 @@ msgstr ""
 "sign, check, encrypt ці decrypt\n"
 "Дапомнае дзеяньне залежыць ад уваходных даньняў\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr ""
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7649,7 +7663,7 @@ msgstr ""
 msgid "This is a qualified signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit [выйсьці]"
@@ -7883,78 +7897,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "невядомая вэрсыя"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "выкарыстоўваць у якасьці файла вываду"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Выкарыстаньне: gpg [выбары] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "сакрэтны ключ недаступны"
@@ -8141,10 +8155,6 @@ msgstr ""
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Паўтарыце пароль\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "невядомая вэрсыя"
-
 #~ msgid "|[file]|make a signature"
 #~ msgstr "|[файл]|зрабіць подпіс"
 
diff --git a/po/ca.po b/po/ca.po
index 7a4b46845..f36358364 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <jordi@gnu.org>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -40,70 +40,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -113,81 +113,81 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 "no s'ha trobat cap anell secret de escrivible: %s\n"
 "\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: no s'ha pogut crear la taula de dispersió: %s\n"
@@ -326,7 +326,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -337,264 +337,264 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 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 <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dades de confiança: ha fallat la lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: no s'ha pogut crear el directori: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -611,8 +611,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -620,8 +620,8 @@ msgstr ""
 "@Ordres:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -632,92 +632,92 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
 # Parts?  Peces?  ivb
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "error de lectura: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -729,19 +729,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -753,7 +753,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -763,11 +763,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -833,40 +833,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "%s: no s'ha trobat l'usuari\n"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no s'ha pogut connectar amb «%s»: %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "hi ha un problema de comunicació amb el gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
@@ -1120,6 +1120,11 @@ msgstr "No hi ha ajuda disponible per a `%s'"
 msgid "ignoring garbage line"
 msgstr "error en l'última línia\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[no establert]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1234,7 +1239,7 @@ msgstr "AVÍS: s'hi han trobat dades de notació invàlides\n"
 msgid "not human readable"
 msgstr "no llegible per humans"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la clau secreta no està disponible"
@@ -1246,8 +1251,8 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1258,30 +1263,30 @@ msgid "This command is only available for version 2 cards\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
 # Parts?  Peces?  ivb
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "La vostra selecció? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[no establert]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "home"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "dóna"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "no especificat"
 
@@ -1289,139 +1294,139 @@ msgstr "no especificat"
 # Probablement és una clau, femení. jm
 # Werner FIXME: please add translator comment saying *what* is
 # uncompressed so we know the gender. jm
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "no forçat"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "forçat"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "no hi ha cap clau pública corresponent: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferències actualitzades"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "hi ha un caràcter invàlid en la cadena de preferència\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Empremta digital:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1429,139 +1434,139 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Seleccioneu quin tipus de clau voleu:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr ""
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "La selecció és invàlida.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "l'algorisme de protecció és desconegut\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ix del menú"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "La clau és disponible en: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "canvia la data de caducitat"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "canvia la confiança"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra empremta"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera un nou parell de claus"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Ordre> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "les ordres entren en conflicte\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -1569,7 +1574,7 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
@@ -1899,37 +1904,37 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fitxer]|crea una signatura"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fitxer]|crea una signatura en text clar"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "crea una signatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "xifra dades"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "xifra només amb xifratge simètric"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "desxifra dades (predeterminat)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verifica una signatura"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "llista claus"
 
@@ -1944,11 +1949,11 @@ msgid "list and check key signatures"
 msgstr "comprova les signatures de la claus"
 
 # «dactilars» o «digitals»?  ivb
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "llista claus i empremtes digitals"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "llista claus secretes"
 
@@ -1956,7 +1961,7 @@ msgstr "llista claus secretes"
 msgid "generate a new key pair"
 msgstr "genera un nou parell de claus"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "elimina claus de l'anell públic"
 
@@ -1984,11 +1989,11 @@ msgstr "genera un certificat de revocació"
 msgid "export keys"
 msgstr "exporta claus"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exporta claus a un servidor de claus"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importa claus d'un servidor de claus"
 
@@ -2025,20 +2030,20 @@ msgstr "actualitza la base de dades de confiança"
 msgid "print message digests"
 msgstr "|algo [fitxers]|imprimeix resums de missatges"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|xifra per a NOM"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa aquest id per a signar o desxifrar"
@@ -2052,12 +2057,12 @@ msgstr "|N|nivell de compressió N (0 no comprimeix)"
 msgid "use canonical text mode"
 msgstr "usa el mode de text canònic"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "no fa cap canvi"
 
@@ -2069,7 +2074,7 @@ msgstr "pregunta abans de sobreescriure"
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2080,7 +2085,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:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2123,7 +2128,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:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2151,7 +2156,7 @@ msgstr "Compressió: "
 msgid "usage: gpg [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "les ordres entren en conflicte\n"
 
@@ -2230,467 +2235,467 @@ msgstr "AVÍS: els permissos del directori envoltant són insegurs en %s «%s»\
 msgid "unknown configuration item `%s'\n"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, 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:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra en quin anell de claus està una clau llistada"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, 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:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, 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:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, 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:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, 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:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 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:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 #, 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:3161
+#: g10/gpg.c:3156
 #, 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, 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:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 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:4275
+#: g10/gpg.c:4273
 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:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -2704,7 +2709,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:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|escriu informació d'estat en aquest FD"
 
@@ -3525,20 +3530,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Les parts secretes de la clau primària no estan disponibles.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3555,7 +3560,7 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -4387,12 +4392,12 @@ msgid "writing key binding signature\n"
 msgstr "s'està escrivint la signatura de comprovació de la clau\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, 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:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4463,76 +4468,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA i ElGamal (predeterminat)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (només signar)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (només signar)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (només xifrar)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (només signar)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (només xifrar)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (només signar)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (només xifrar)\n"
 
-#: g10/keygen.c:1731
-#, 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:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Quina grandària voleu? (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Quina grandària voleu? (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4548,7 +4558,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4564,42 +4574,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, 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:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4607,12 +4617,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4623,7 +4633,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4640,44 +4650,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 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:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4688,7 +4698,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4705,23 +4715,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:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4729,12 +4739,19 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Introduïu la contrasenya; aquesta ha de ser una frase secreta \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4746,7 +4763,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4758,53 +4775,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, 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:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, 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:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, 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:3525
+#: g10/keygen.c:3574
 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:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4813,13 +4830,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, 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:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4828,7 +4845,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4836,26 +4853,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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, 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:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5395,41 +5412,41 @@ msgstr "signatura %s, algorisme de resum %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el mòdul de xifratge IDEA no està present\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostra més informació\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: l'opció «%s» està desaconsellada.\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "si us plau, utilitzeu «%s%s» en el seu lloc\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "AVÍS: %s és una opció desaconsellada.\n"
@@ -5437,7 +5454,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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "No comprimit"
 
@@ -5445,22 +5462,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:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "No comprimit"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
@@ -5505,22 +5522,22 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVÍS: les opcions en «%s» encara no estan actives durant aquesta execució\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5536,7 +5553,7 @@ msgstr " (ID de la clau principal %08lX)"
 # Se't passava l'argument «*».  printf(3), hieroglyph(7).  ivb
 # Ah!  Prova-ho, no casque alguna cosa :P  ivb
 # Ah, ja veig! Moltes gràcies! Aquest msgstr ha quedat curiós :) jm
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5549,29 +5566,20 @@ msgstr ""
 "«%2$.*1$s»\n"
 "clau %4$s de %3$u bits, ID %5$08lX, creada en %6$s%7$s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Introduïu la contrasenya\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "s'ha cancel·lat per l'usuari\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-# Gènere?  Nombre?  Passat, futur?  ivb
-# Probablement és una clau, femení. jm
-# Werner FIXME: please add translator comment saying *what* is
-# uncompressed so we know the gender. jm
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "no forçat"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5581,12 +5589,12 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clau %2$s de %1$u bits, ID %3$08lX, creada en %4$s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6789,6 +6797,15 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+# Gènere?  Nombre?  Passat, futur?  ivb
+# Probablement és una clau, femení. jm
+# Werner FIXME: please add translator comment saying *what* is
+# uncompressed so we know the gender. jm
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "no forçat"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6881,19 +6898,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6942,7 +6959,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
@@ -6962,15 +6979,15 @@ msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6989,150 +7006,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "s'ha produït un error en llegir el bloc de claus: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7149,63 +7165,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Introduïu el nom d'usuari: "
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOM|usa NOM com a destinatari predeterminat"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "no usa el terminal en absolut"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "les ordres entren en conflicte\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7313,7 +7329,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7802,148 +7818,148 @@ msgstr "certificat duplicat: esborrat"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "no s'ha pogut eliminar el bloc de claus: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "llista claus secretes"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificat de revocació vàlid"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificat correcte"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "canvia la contrasenya"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea eixida amb armadura ascii"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "no usa el terminal en absolut"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
 # Mode desatès (SC)  ivb
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "mode desatès: no pregunta mai"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "suposa «sí» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "suposa «no» en la majoria de les preguntes"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "afegeix aquest anell a la llista"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOM|usa NOM com a clau secreta predeterminada"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|usa aquest servidor per a cercar claus"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOM|usa l'algoritme de xifratge NOM"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOM|usa l'algoritme de resum de missatges NOM"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, 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:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7954,61 +7970,57 @@ msgstr ""
 "signa, comprova, xifra o desxifra\n"
 "l'operació predeterminada depén de les dades introduïdes\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "el destinatari predeterminat és desconegut «%s»\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(No es va donar una descripció)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omet aquesta clau\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8184,7 +8196,7 @@ msgstr ""
 "\n"
 "Açò serà una autosignatura.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ix"
@@ -8419,78 +8431,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "s'ha creat el nou fitxer d'opcions «%s»\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "fitxer d'eixida"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "forma d'ús: gpg [opcions] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "no s'ha trobat la clau pública"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr ""
 
@@ -8676,13 +8688,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "La parella de claus DSA ha de tenir 1024 bits.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Repetiu la contrasenya\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[no establert]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "s'estan llegint opcions de «%s»\n"
diff --git a/po/cs.po b/po/cs.po
index c75843f71..6570bbb37 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-11-26 09:12+0200\n"
 "Last-Translator: Roman Pavlik <rp@tns.cz>\n"
 "Language-Team: Czech <translations.cs@gnupg.cz>\n"
@@ -20,71 +20,71 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -94,79 +94,79 @@ msgstr "
 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepoda�ilo se vytvo�it hashovac� tabulku: %s\n"
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -315,264 +315,264 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodate�n�mi informacemi"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "b�t o trochu v�c tich�"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyhledat kl��e na serveru kl���"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "nastavit sadu preferenc� pro vybran� u�ivatelsk� ID"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizovat datab�zi d�v�ry"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Chyby oznamte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "P�ipom�nky k p�ekladu <rp@tns.cz>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba p�i hled�n� z�znamu d�v�ryhodnosti v `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualizace tajn�ho kl��e selhala: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "�patn� form�t prom�nn� prost�ed� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -589,8 +589,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -598,8 +598,8 @@ msgstr ""
 "@P��kazy:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -610,91 +610,91 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba v `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba p�i �ten� v `%s': %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -706,19 +706,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -730,7 +730,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -740,11 +740,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -810,39 +810,39 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "chyba p�i vytv��en� `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[ID u�ivatele nenalezeno]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nemohu se p�ipojit k `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
@@ -1080,6 +1080,11 @@ msgstr "Pomoc nen
 msgid "ignoring garbage line"
 msgstr "chyba v pati�ce\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[nen� nastaven]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1188,7 +1193,7 @@ msgstr "VAROV
 msgid "not human readable"
 msgstr "nen� v p��mo �iteln�m form�tu"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGp karta nen� dostupn�: %s\n"
@@ -1198,8 +1203,8 @@ msgstr "OpenPGp karta nen
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta ��slo %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1208,158 +1213,158 @@ msgstr "nelze prov
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento p��kaz nen� v m�d� %s dovolen�.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�b�r? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[nen� nastaven]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "mu�"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "�ena"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "neuvedeno"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "nen� vy�adov�no"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "vy�adov�no"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Chyba: V sou�asn� verzi je povolenou pouze plain ASCII.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Chyba: Znak \"<\" nelze pou��t.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Chyba: V�ce mezer nen� povoleno.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "P��jmen� dr�itele karty: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Jm�no (k�estn�) dr�itele karty: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Chyba: jm�no a p��jmen� je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL pro z�sk�n� ve�ejn�ho kl��e: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Chyba: URL je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba p�i vytv��en� souboru kl��� (keyring)`%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Login (jm�nu ��tu): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Chyba: Login je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Priv�tn� DO data: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Chyba: Priv�tn� DO je p��li� dlouh� (limit je %d znak�).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Jazykov� p�edvolby: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Chyba: neplatn� d�lka �etezce s p�edvolbami.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Chyba: neplatn� znak v �et�zci s p�edvolbami\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Zadejte pohlav�: M - mu�sk�, F - �ensk� nebo stisn�te mezern�k: "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Chyba: neplatn� odpov��.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA fingerprint: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Chyba: nespr�vn� naform�tovan� fingerprint.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operace s kl��em nen� mo�n�: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "toto nen� OpenPGP karta"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "P�epsat existuj�c� kl��? (a/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Vytvo�it z�lohu �ifrovac�ho kl��e mimo kartu? (A/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "P�epsat existuj�c� kl��e? (a/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1370,124 +1375,124 @@ msgstr ""
 "   PIN = `%s'     PIN administr�tora = `%s'\n"
 "Toto nastaven� m��ete zm�nit p��kazem --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh kl��e, kter� chcete generovat:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Podepisovac� kl��\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �ifrovac� kl��\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiza�n� kl��\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�b�r.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m vyberte m�sto pro uchov�n� kl��e:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�m� algoritmus pro ochranu kl��e\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "tajn� ��sti kl�e nejsou dostupn�\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "tajn� kl�� je na kart� ulo�en\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ukon�it toto menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "uk�zat tuto pomoc"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "vypi� v�echna dostupn� data"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "zm�n� jm�no majitele karty"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "zm�n� URL pro z�sk�n� kl��e"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "z�sk� kl�� specifikovan� v URL karty"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "zm�nit login name"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "zm�nit jazykov� p�edvolby"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "zm�n� pohlav� dr�itele karty"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "vypsat fingerprint certifika�n� autority"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "zapnout/vypnout po�adov�n� PINu p�i ka�d� self-sign operaci"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "nab�dka pro zm�nu anebo odblokov�n� PINu"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "ov�� PIN a vypi� v�echna data"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "P��kaz> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "pouze administr�torsk� p��kazy\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "administr�torsk� p��kazy jsou povoleny\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� p��kaz (zkuste \"help\")\n"
 
@@ -1495,7 +1500,7 @@ msgstr "Neplatn
 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:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
@@ -1804,37 +1809,37 @@ msgstr "pou
 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[soubor]|vytvo�it podpis"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[soubor]|vytvo�it podpis v �iteln�m dokumentu"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "vytvo�it podpis odd�len� od dokumentu"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "�ifrovat data"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrov�n� pouze se symetrickou �ifrou"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "de�ifrovat data (implicitn�)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verifikovat podpis"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "vypsat seznam kl���"
 
@@ -1846,11 +1851,11 @@ msgstr "vypsat seznam kl
 msgid "list and check key signatures"
 msgstr "vypsat a zkontrolovat podpisy kl���"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "vypsat seznam kl��� a fingerprint�"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
@@ -1858,7 +1863,7 @@ msgstr "vypsat seznam tajn
 msgid "generate a new key pair"
 msgstr "vytvo�it nov� p�r kl���"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "odstranit kl�� ze souboru ve�ejn�ch kl���"
 
@@ -1886,11 +1891,11 @@ msgstr "vytvo
 msgid "export keys"
 msgstr "exportovat kl��e"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exportovat kl��e na server kl���"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importovat kl��e ze serveru kl���"
 
@@ -1927,20 +1932,20 @@ msgstr "aktualizovat datab
 msgid "print message digests"
 msgstr "|algo [soubory]  vypi� hash"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|JM�NO|�ifrovat pro JM�NO"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
@@ -1958,12 +1963,12 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "pou��t kanonick� textov� m�d"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "neprov�d�t ��dn� zm�ny"
 
@@ -1975,7 +1980,7 @@ msgstr "vy
 msgid "use strict OpenPGP behavior"
 msgstr "pou��t chov�n� striktn� podle OpenPGP"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1983,7 +1988,7 @@ msgstr ""
 "@\n"
 "(Pou�ijte manu�lov� str�nky pro kompletn� seznam v�ech p��kaz� a mo�nost�)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2021,7 +2026,7 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2049,7 +2054,7 @@ msgstr "Komprese: "
 msgid "usage: gpg [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "konfliktn� p��kazy\n"
 
@@ -2144,458 +2149,458 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, 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:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "V souboru tajn�ch kl��� chyb� odpov�daj�c� podpis\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nen� platn� znakov� sada\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parametr pro server kl���\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "neplatn� parametr pro import\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "neplatn� parametr pro export\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "neplatn� parametr pro v�pis\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nen� platn� doba expirace podpisu\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parametr pro ov��en�\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROV�N�: program m��e vytvo�it soubor core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROV�N�: %s p�ep��e %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nen� dovoleno pou��vat %s s %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�v� s %s smysl!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� komprimovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 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:3155
+#: g10/gpg.c:3150
 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:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� p�edvolby\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro �ifrov�n�\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro hashov�n�\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u�ivatelsk� p�edvolby pro komprimaci\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud nen� funk�n� s %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat datab�zi d�v�ry: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [jm�no souboru]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrick� �ifrov�n� `%s' se nepovedlo: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [jm�no souboru]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jm�no souboru]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jm�no souboru]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jm�no souboru]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jm�no souboru]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id u�ivatele"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u�ivatele"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u�ivatele [p��kazy]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odesl�n� na keyserver se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "z�sk�n� dat z keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export kl��e se nepoda�il: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hled�n� na keyserveru se nezda�ilo: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh dat na keyserveru se nezda�il: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dov�n� z ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dov�n� do ASCII form�tu selhalo: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[jm�no souboru]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�n�te ps�t svou zpr�vu ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pro certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pro podepisovac� politiku je neplatn�\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL preferovan�ho serveru kl��� je neplat�\n"
 
@@ -2608,7 +2613,7 @@ msgstr "ber kl
 msgid "make timestamp conflicts only a warning"
 msgstr "pouze varov�n� p�i konfliktu �asov�ho raz�tka"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zapsat informace o stavu do tohoto FD"
 
@@ -3395,19 +3400,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� ��st prim�rn�ho kl��e jsou ulo�eny na kart�.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
@@ -3424,7 +3429,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
@@ -4181,12 +4186,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisuji \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�lka kl��e; pou�iji %u bit�\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
@@ -4255,76 +4260,81 @@ msgstr "   (%c) Zapnout/vypnout schopnost autentizovat\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Konec\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (pouze pro podpis)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (pouze pro �ifrov�n�)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (pouze pro �ifrov�n�)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (nastavit si vlastn� pou�it�)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nastavit si vlastn� pou�it�)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Jakou d�lku kl��e si p�ejete? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4340,7 +4350,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:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4356,38 +4366,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:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4395,11 +4405,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4410,7 +4420,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4426,44 +4436,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4474,7 +4484,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4489,25 +4499,25 @@ msgstr "Do pole jm
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4515,12 +4525,19 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� v�ta \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4532,7 +4549,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4545,50 +4562,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, 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:3525
+#: g10/keygen.c:3574
 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:3536
+#: g10/keygen.c:3585
 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"
@@ -4596,12 +4613,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4609,7 +4626,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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4617,25 +4634,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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, 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:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, 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"
@@ -5162,65 +5179,65 @@ msgstr "VAROV
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VAROV�N�: vy��dan� algoritmus %s nen� doporu�en\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pro GnuPG nenalezen\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, 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:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�it� parametru \"%s\" se nedoporu�uje\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, 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:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ijte m�sto n�j \"%s%s\" \n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Nezakomprimov�no"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "nezakomprimov�no|nic"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "nejednozna�n� volby `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
@@ -5262,26 +5279,26 @@ msgstr "vytvo
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROV�N�: nastaven� z `%s' nejsou p�i tomto spu�t�n� zat�m aktivn�\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem ve�ejn�ho kl��e %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROV�N�: potencion�ln� nebezpe�n� symetricky za�ifrov�n kl�� sezen�\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5294,25 +5311,20 @@ msgstr ""
 "\"%.*s\"\n"
 "Kl�� o d�lce %u bit�, typ %s, ID %s, vytvo�en� %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Vlo�it heslo\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "zru�eno u�ivatelem\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "nen� vy�adov�no"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5321,12 +5333,12 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�lka %u bit�, typ %s, kl�� %s, vytvo�en� %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
@@ -6477,6 +6489,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nen� vy�adov�no"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6571,19 +6588,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
@@ -6632,7 +6649,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba p�i z�sk�n� nov�ho PINu: %s\n"
@@ -6652,15 +6669,15 @@ msgstr "ulo
 msgid "reading public key failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "odpov�� neobsahuje ve�ejn� kl��\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
@@ -6679,148 +6696,147 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
 
-#: scd/app-openpgp.c:1598
-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:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "chyba p�i z�sk�n� CHV z karty\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "Do trval�ho uzam�en� karty z�st�v� %d pokus� o zad�n� PINu administr�tora\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+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:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN pro CHV%d je p��li� kr�tk�; minim�ln� d�lka je %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "sch�z� RSA prime %s nebo nem� velikost %d bit�\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -6837,60 +6853,60 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "zobraz administr�torsk� p��kazy"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -6997,7 +7013,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "�ten� ve�ejn�ho kl��e se nezda�ilo: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "nelze ulo�it kl��: %s\n"
@@ -7463,148 +7479,148 @@ msgstr "duplicita p
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "smaz�n� bloku kl��e se nezda�ilo:  %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "vypsat seznam tajn�ch kl���"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "�patn� certifik�t"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 #, fuzzy
 msgid "register a smartcard"
 msgstr "p�idat kl�� na kartu"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zm�nit heslo"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "ber kl��e z t�to kl��enky (keyringu)"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "nezn�m� �ifrovac� algoritmus"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7615,60 +7631,56 @@ msgstr ""
 "podepsat, ov��it, �ifrovat nebo de�ifrovat\n"
 "implicitn� operace z�vis� na vstupn�ch datech\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�m� volba `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nebyl zad�n ��dn� popis)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = p�esko�it tento kl��\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nelze zpracovat URL serveru kl���\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7842,7 +7854,7 @@ msgstr "                alias \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "Jedn� se o podpis kl��e j�m sam�m.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�it"
@@ -8076,80 +8088,80 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
 # c-format
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
 # c-format
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�m� konfigura�n� polo�ka \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "pou��t jako v�stupn� soubor"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�it�: gpg [mo�nosti] [soubory] (-h pro pomoc)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "u�it�: gpg [mo�nosti]"
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "ve�ejn� kl�� nenalezen"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "administr�torsk� p��kazy nejsou povoleny\n"
@@ -8335,6 +8347,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "P�r DSA kl��� DSA dlouh� %u bit�.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Opakovat heslo\n"
 
@@ -8345,10 +8360,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|PIN administr�tora"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[nen� nastaven]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "�tu mo�nosti z `%s'\n"
diff --git a/po/da.po b/po/da.po
index 42ba41732..46d93e49c 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <birger.langkjer@image.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -22,67 +22,67 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -92,80 +92,80 @@ msgstr "d
 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -315,260 +315,260 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Rapport�r venligst fejl til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -585,8 +585,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -594,8 +594,8 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -606,87 +606,87 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "panser: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -698,19 +698,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -722,7 +722,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -732,11 +732,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -802,38 +802,38 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "%s: bruger ikke fundet\n"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -1067,6 +1067,11 @@ msgstr "Ingen hj
 msgid "ignoring garbage line"
 msgstr "fejl i trailerlinie\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "ukendt version"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1176,7 +1181,7 @@ msgstr "ingen gyldig OpenPGP data fundet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
@@ -1186,8 +1191,8 @@ msgstr "hemmelig n
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -1195,171 +1200,171 @@ msgstr ""
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Dit valg? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "sl�til"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "sl�til"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "ikke bearbejdet"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingeraftryk:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1367,140 +1372,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldigt valg.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "ukendt kompressionsalgoritme"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Ingen hj�lp tilg�ngelig"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "�ndr udl�bsdatoen"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "vis pr�ferencer"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr ""
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -1508,7 +1513,7 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
@@ -1809,37 +1814,37 @@ msgstr "bruger sekund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[filer]|opret rentekst signatur"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "opret en separat signatur"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "krypt�r data"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "krypt�r kun med symmetriske cifre"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "afkrypt�r data (standard)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "godkend en signatur"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "vis n�gler"
 
@@ -1852,11 +1857,11 @@ msgstr "vis n
 msgid "list and check key signatures"
 msgstr "tjek n�glesignaturer"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "vis n�gle og fingeraftryk"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "vis hemmelige n�gler"
 
@@ -1864,7 +1869,7 @@ msgstr "vis hemmelige n
 msgid "generate a new key pair"
 msgstr "gener�r et nyt n�glepar"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "fjern n�gle fra den offentlige n�glering"
@@ -1894,11 +1899,11 @@ msgstr "Gener
 msgid "export keys"
 msgstr "eksport�r n�gler"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "import�r n�gler fra en n�gleserver"
 
@@ -1937,20 +1942,20 @@ msgstr "opdat
 msgid "print message digests"
 msgstr "|algo [filer]|print meddelelsesresum�"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAME|krypt�r for NAME"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "brug denne bruger-id til at signere eller dekryptere"
@@ -1964,12 +1969,12 @@ msgstr "|N|s
 msgid "use canonical text mode"
 msgstr "brug kanonisk tekstmodus"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "lav ingen �ndringer"
 
@@ -1981,13 +1986,13 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2026,7 +2031,7 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2055,7 +2060,7 @@ msgstr "Kommentar: "
 msgid "usage: gpg [options] "
 msgstr "brug: gpg [flag] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "konfliktende kommandoer\n"
 
@@ -2131,469 +2136,469 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3154
 #, 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:3161
+#: g10/gpg.c:3156
 #, 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2608,7 +2613,7 @@ msgstr "Slet denne n
 msgid "make timestamp conflicts only a warning"
 msgstr "tidsstempelkonflikt"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinfo til denne FD"
 
@@ -3369,21 +3374,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
@@ -3398,7 +3403,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -4194,12 +4199,12 @@ msgid "writing key binding signature\n"
 msgstr ""
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�nsket n�glest�rrelse er %u bit\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
@@ -4270,76 +4275,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA og ElGamal (standard)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) ElGamal (krypt�r kun)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (krypt�r kun)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (sign�r kun)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keygen.c:1667
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) ElGamal (krypt�r kun)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (krypt�r kun)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA n�glepar vil have 1024 bit.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Hvilken n�glest�rrelse �nsker du? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4349,7 +4359,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4359,52 +4369,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4415,7 +4425,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4425,44 +4435,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4473,7 +4483,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4488,24 +4498,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 #, 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4513,12 +4523,21 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
+"\n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4526,7 +4545,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4534,92 +4553,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -5156,67 +5175,67 @@ msgstr "%s signatur fra: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ikke bearbejdet"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ikke bearbejdet"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
@@ -5259,26 +5278,26 @@ msgstr ""
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5290,26 +5309,21 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Indtast kodes�tning: "
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "ikke bearbejdet"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5318,12 +5332,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6454,6 +6468,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ikke bearbejdet"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6546,19 +6565,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6607,7 +6626,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -6628,15 +6647,15 @@ msgstr "ingen standard offentlig n
 msgid "reading public key failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6655,151 +6674,150 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
 # er det klogt at overs�tte TrustDB?
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -6816,63 +6834,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Indtast bruger-id: "
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|brug NAME som standard modtager"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "brug overhovedet ikke terminalen"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "konfliktende kommandoer\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -6980,7 +6998,7 @@ msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
 # er det klogt at overs�tte TrustDB?
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
@@ -7440,148 +7458,148 @@ msgstr "vis pr
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adresser\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "vis hemmelige n�gler"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldigt certifikat"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "Godt certifikat"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "opret ascii beskyttet uddata"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "brug overhovedet ikke terminalen"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "k�rselsmodus: sp�rg aldrig"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "forvent ja til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "forvent nej til de fleste spr�gsm�l"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "tilf�j denne n�glering til n�gleringslisten"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAME|brug NAME som standard hemmelign�gle"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|brug denne n�gletjener til at sl� n�gler op"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|brug cifferalgoritme NAME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|brug meddelelsesresum� algoritme NAME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, 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:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7592,60 +7610,56 @@ msgstr ""
 "sign, check, encrypt eller decrypt\n"
 "standard operation afh�nger af inddata\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "brug: gpg [flag] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s: udelod: %s\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7821,7 +7835,7 @@ msgstr "              alias \""
 msgid "This is a qualified signature\n"
 msgstr "skriver selvsignatur\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "afslut"
@@ -8057,78 +8071,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukendt standard modtager '%s'\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "brug som uddatafil"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "brug: gpg [flag] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "offentlig n�gle ikke fundet"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
@@ -8313,12 +8327,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#~ msgid "Repeat passphrase\n"
-#~ msgstr "Gentag kodes�tning: "
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA n�glepar vil have 1024 bit.\n"
 
 #, fuzzy
-#~ msgid "[none]"
-#~ msgstr "ukendt version"
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Gentag kodes�tning: "
 
 #, fuzzy
 #~ msgid "read options from file"
diff --git a/po/de.po b/po/de.po
index 9b08ef821..61ad085d7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.10\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:14+0200\n"
-"PO-Revision-Date: 2009-03-24 18:54+0100\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
+"PO-Revision-Date: 2009-06-08 10:05+0200\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -23,7 +23,26 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Die Sperre für das Pinentry kann nicht gesetzt werden: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+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:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -31,7 +50,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,55 +58,36 @@ msgstr ""
 "Bitte geben Sie Ihre Passphrase ein, so daß der geheime Schlüssel benutzt "
 "werden kann"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-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:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -96,66 +96,66 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "'%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Fehler beim Holen der Karten-Seriennummer: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "Erkannte Karte hat die Seriennummer: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "Fehler beim Holen der Authentisierungsschlüssel-ID der Karte: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "keine passender Kartenschlüssel gefunden: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "\"Shadowing\" des Schlüssels schlug fehl: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "Fehler beim Schreiben des Schlüssels: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Bitte geben Sie die Passphrase für den SSH-Schlüssel %0A  %c ein"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -164,12 +164,12 @@ msgstr ""
 "Bitte geben Sie eine Passphrase ein, um den empfangenen geheimen Schlüssel%%"
 "0A   %s%%0A im Schlüsselspeicher des gpg-agenten zu schützen"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "Das Erzeugen eines Datenstroms aus dem Socket schlug fehl: %s\n"
@@ -313,7 +313,7 @@ msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen"
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -322,109 +322,109 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "benutze PINs im Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "Die ssh-agent-Emulation anschalten"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariablen auf DATEI"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Fehlerberichte bitte an <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -432,144 +432,144 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, 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:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fehler beim Erstellen von `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "Ein gpg-agent läuft bereits - ein weiterer wird nicht gestartet\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Der Socket kann nicht an `%s' gebunden werden: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "Die Datei `%s' kann nicht als Home-Verzeichnis benutzt werden\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Fehler beim Lesen der \"Nonce\" von FD %d: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "Handhabungsroutine 0x%lx für den fd %d beendet\n"
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d gestartet\n"
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH-Handhabungsroutine 0x%lx für fd %d beendet\n"
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 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:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,8 +587,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Kennwortpuffer-Pflege\n"
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -596,8 +596,8 @@ msgstr ""
 "@Befehle:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -608,11 +608,11 @@ msgstr ""
 "Optionen:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Aufruf: gpg-protect-tool [Optionen] (-h für Hilfe)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -620,16 +620,16 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bitte geben Sie die Passphrase zum Entsperren des PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "Bitte geben Sie die Passphrase zum Schützen des neuen PKCS#12 Objekts ein"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -637,7 +637,7 @@ msgstr ""
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -645,58 +645,58 @@ msgstr ""
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt, um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Fehler bei der Abfrage der Passphrase: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Fehler beim Öffnen von `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "Datei `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 "Anweisung \"%s\" in `%s', Zeile %d\n"
 " ignoriert\n"
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr ""
 "Systemliste der vertrauenswürdigen Zertifikate '%s' ist nicht vorhanden\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "fehlerhafter Fingerabdruck in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "Ungültiges Schlüsselflag in `%s', Zeile %d\n"
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Fehler beim Lesen von `%s', Zeile %d: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 
@@ -708,7 +708,7 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -717,11 +717,11 @@ msgstr ""
 "Wenn Sie vollständiges Vertrauen haben, daß%%0A  \"%s\"%%"
 "0ABenutzerzertifikate verläßlich zertifiziert, so antworten Sie mit \"Ja\"."
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "Nein"
 
@@ -733,7 +733,7 @@ msgstr "Nein"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -745,11 +745,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr "Falsch"
 
@@ -818,37 +818,37 @@ msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "Fehler beim Erstellen des Sockets: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "Host nicht gefunden"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG-Agent ist in dieser Sitzung nicht vorhanden\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Verbindung zu '%s' kann nicht aufgebaut werden: %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunikationsproblem mit GPG-Agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "Beim Setzen der gpg-agent Optionen ist ein Problem aufgetreten\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "Vom Benutzer abgebrochen\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "Problem mit dem Agenten\n"
 
@@ -1067,6 +1067,10 @@ msgstr "Keine Hilfe für '%s' vorhanden."
 msgid "ignoring garbage line"
 msgstr "Zeile mit nicht identifizierten Zeichen wird ignoriert"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[keine]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1174,7 +1178,7 @@ msgstr "WARNUNG: Ungültige \"Notation\"-Daten gefunden\n"
 msgid "not human readable"
 msgstr "nicht als Klartext darstellbar"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
@@ -1184,8 +1188,8 @@ msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1193,159 +1197,159 @@ msgstr "Dies kann im Batchmodus nicht durchgeführt werden.\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Dieser Befehl ist nur für Karten ab Version 2 möglich.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr "Der Rückstellcode ist nicht vorhanden\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ihre Auswahl? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[nicht gesetzt]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "männlich"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "weiblich"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "unbestimmt"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "nicht zwingend"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "zwingend"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fehler: Nur reines ASCII ist derzeit erlaubt.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fehler: Das Zeichen \"<\" kann nicht benutzt werden.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fehler: Doppelte Leerzeichen sind nicht erlaubt.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Familienname des Kartenbesitzers:"
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Vorname des Kartenbesitzers:"
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 "Fehler: Der zusammengesetzte Name ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL um den öffentlichen Schlüssel zu holen: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fehler: URL ist zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Fehler beim Zuteilen genügenden Speichers: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Fehler beim Lesen von `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Logindaten (Kontenname): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fehler: Logindaten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Geheime DO-Daten: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fehler: Geheime DO-Daten sind zu lang (Grenze beträgt %d Zeichen).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Spracheinstellungen"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fehler: Ungültige Länge der Einstellungs-Zeichenfolge.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fehler: Ungültige Zeichen in der Einstellungs-Zeichenfolge\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Geschlecht: (Männlich (M), Weiblich (F) oder Leerzeichen): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Fehler: ungültige Antwort.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA-Fingerabdruck: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fehler: ungültig geformter Fingerabdruck.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Schlüsseloperation nicht möglich: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "Keine gültige OpenPGP-Karte"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Fehler beim Holen der aktuellen Schlüsselinfo: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Vorhandenen Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "Sicherung des Verschlüsselungsschlüssel außerhalb der Karte erstellen? (J/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Vorhandene Schlüssel ersetzen? (j/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1356,124 +1360,124 @@ msgstr ""
 "   PIN = `%s'     Admin-PIN = `%s'\n"
 "Sie sollten sie mittels des Befehls --change-pin ändern\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Bitte wählen Sie die Art des Schlüssel, der erzeugt werden soll:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Unterschriften-Schlüssel\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Verschlüsselungs-Schlüssel\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Authentisierungs-Schlüssel\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ungültige Auswahl.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Wählen Sie den Speicherort für den Schlüssel:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "Unbekanntes Schlüssel-Schutzverfahren\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "Geheime Teile des Schlüssels sind nicht vorhanden\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "Geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "Alle vorhandenen Daten auflisten"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "Kartenbesitzernamen ändern"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "Schlüssel-holen-URL ändern"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "Holen des Schlüssels mittels der URL auf der Karte"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "Ändern der Logindaten"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "Ändern der Spracheinstellungen"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "Ändern des Geschlechts des Kartenbesitzers"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "Ändern des CA-Fingerabdrucks"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "Umschalten des \"Signature-force-PIN\"-Schalters"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "neue Schlüssel erzeugen"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "Menü für Ändern oder Entsperren der PIN"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "überprüfe die PIN und liste alle Daten auf"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr "die PIN mit dem Rückstellcode wieder freigeben"
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Befehl> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "nur-Admin Befehl\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Admin-Befehle sind erlaubt\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -1481,7 +1485,7 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
@@ -1800,35 +1804,35 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 msgid "make a signature"
 msgstr "Eine Unterschrift erzeugen"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 msgid "make a clear text signature"
 msgstr "Eine Klartextunterschrift erzeugen"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "Eine abgetrennte Unterschrift erzeugen"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "Daten verschlüsseln"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "Daten symmetrisch verschlüsseln"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "Daten entschlüsseln (Voreinstellung)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "Signatur prüfen"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "Liste der Schlüssel"
 
@@ -1840,11 +1844,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:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "Liste der Schlüssel und ihrer \"Fingerabdrücke\""
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "Liste der geheimen Schlüssel"
 
@@ -1852,7 +1856,7 @@ msgstr "Liste der geheimen Schlüssel"
 msgid "generate a new key pair"
 msgstr "Ein neues Schlüsselpaar erzeugen"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "Schlüssel aus dem öff. Schlüsselbund entfernen"
 
@@ -1880,11 +1884,11 @@ msgstr "Ein Schlüsselwiderruf-Zertifikat erzeugen"
 msgid "export keys"
 msgstr "Schlüssel exportieren"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "Schlüssel zu einem Schlü.server exportieren"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "Schlüssel von einem Schlü.server importieren"
 
@@ -1920,19 +1924,19 @@ msgstr "Ändern der \"Trust\"-Datenbank"
 msgid "print message digests"
 msgstr "Hashwerte für die Dateien ausgeben"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|Verschlüsseln für USER-ID"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|Mit USER-ID signieren bzw. entschlüsseln"
 
@@ -1944,11 +1948,11 @@ msgstr "|N|Kompressionsstufe auf N setzen (0=keine)"
 msgid "use canonical text mode"
 msgstr "Textmodus benutzen"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr "|DATEI|Ausgabe auf DATEI schreiben"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "Keine wirklichen Änderungen durchführen"
 
@@ -1960,7 +1964,7 @@ msgstr "vor Überschreiben nachfragen"
 msgid "use strict OpenPGP behavior"
 msgstr "OpenPGP-Verhalten strikt beachten"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1969,7 +1973,7 @@ msgstr ""
 "(Auf der \"man\"-Seite ist eine vollständige Liste aller Befehle und "
 "Optionen)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2009,7 +2013,7 @@ msgstr ""
 "Signieren, prüfen, verschlüsseln, entschlüsseln.\n"
 "Die voreingestellte Operation ist abhängig von den Eingabedaten\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2037,7 +2041,7 @@ msgstr "Komprimierung: "
 msgid "usage: gpg [options] "
 msgstr "Aufruf: gpg [Optionen] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "Widersprüchliche Befehle\n"
 
@@ -2124,463 +2128,464 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "Unbekanntes Konfigurationselement `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "Anzeigen der Foto-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "Zeige Richtlinien-URL während der Unterschriftenlisten"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "Alle Notationen mit den Signaturen anlisten"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "Zeige IETF-Standard"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "Zeige anwenderseitige Notationen in den Unterschriftenlisten"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "Der bevorzugten Schlüsselserver mit den Signaturen anlisten"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "Zeige Gültigkeit der User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr "Zeige widerrufene und verfallene User-ID in den Schlüssellisten"
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "Zeige widerrufene und verfallene Unterschlüssel in den Schlüssellisten"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "Anzeigen des Schlüsselbundes, in dem ein Schlüssel drin ist"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "Das Ablaufdatum mit den Signaturen anlisten"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "Hinweis: Alte voreingestellte Optionendatei '%s' wurde ignoriert\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
-"Die Bibliothek \"libgcrypt\" ist zu alt (benötigt wird %s, vorhanden ist %s)\n"
+"Die Bibliothek \"libgcrypt\" ist zu alt (benötigt wird %s, vorhanden ist %"
+"s)\n"
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Unterschriftablaufdatum\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "Zeige die Foto-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "Zeige Richtlinien-URLs während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "Zeige IETF-Standard-Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "Zeige anwenderseitige Notationen während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 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:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Unterschriftenprüfung anzeigen"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 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:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Hauptuser-ID während der Unterschriftenprüfung"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Unterschriftengültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 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:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüsseln einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Unterschriften-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2592,7 +2597,7 @@ msgstr "|DATEI|Schlüssel aus der Schlüsselbund DATEI nehmen"
 msgid "make timestamp conflicts only a warning"
 msgstr "differierende Zeitangaben sind kein Fehler"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|Statusinfo auf FD (Dateihandle) ausgeben"
 
@@ -3394,19 +3399,19 @@ msgstr ""
 "Der Schlüssel enthält nur \"stub\"- oder \"on-card\"-Schlüsselelemente- "
 "keine Passphrase ist zu ändern.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind nicht vorhanden.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Hauptschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
@@ -3423,7 +3428,7 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -4196,12 +4201,12 @@ msgid "writing key binding signature\n"
 msgstr "Schreiben der \"key-binding\" Signatur\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Ungültige Schlüssellänge; %u Bit werden verwendet\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@ -4272,76 +4277,81 @@ msgstr "   (%c) Umschalten der Authentisierungsfähigkeit\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Beenden\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
-msgstr "   (%d) DSA und Elgamal (voreingestellt)\n"
+msgid "   (%d) RSA and RSA (default)\n"
+msgstr "   (%d) RSA und RSA (voreingestellt)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA und Elgamal\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur unterschreiben/beglaubigen)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur signieren/beglaubigen)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (nur verschlüsseln)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur verschlüsseln)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (Leistungsfähigkeit selber einstellbar)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (Leistungsfähigkeit selber einstellbar)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Welche Schlüssellänge wünschen Sie für den Unterschlüssel? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4357,7 +4367,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:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4373,38 +4383,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:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4412,11 +4422,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4430,7 +4440,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4446,44 +4456,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4494,7 +4504,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4509,23 +4519,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4533,12 +4543,18 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Bitte geben Sie die Passphrase ein, um die Sicherheitskopie des neuen Verschlüsselungsschlüssel der Karte zu schützen."
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4551,7 +4567,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4562,50 +4578,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4614,12 +4630,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4627,7 +4643,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4635,25 +4651,25 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssel sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, 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:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -5186,66 +5202,66 @@ msgstr "WARNUNG: Verwendung des experimentellen Hashverfahrens %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "WARNUNG: Die Verwendung des Hashverfahrens %s ist nicht ratsam\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "das IDEA-Verschlüsselungs-Plugin ist nicht vorhanden\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "Siehe %s für weitere Infos\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: mißbilligte Option \"%s\".\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNUNG: \"%s\" ist eine mißbilligte Option.\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Bitte benutzen Sie stattdessen \"%s%s\".\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, 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:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "nicht komprimiert"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "unkomprimiert|kein|keine"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Mehrdeutige Option '%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "Unbekannte Option '%s'\n"
@@ -5288,28 +5304,28 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "WARNUNG: Optionen in `%s' sind während dieses Laufes noch nicht wirksam\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5323,24 +5339,20 @@ msgstr ""
 "Benutzer: \"%.*s\"\n"
 "%u-bit %s Schlüssel, ID %s, erzeugt %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Geben Sie die Passphrase ein\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "Abbruch durch Benutzer\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-msgid "out of core\n"
-msgstr "Nicht genügend Speicher\n"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5349,12 +5361,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (Unterschlüssel aus Hauptschlüssel-ID %s)"
@@ -5920,8 +5932,8 @@ msgstr "Unsicherer Schlüssel erzeugt - neuer Versuch\n"
 #, c-format
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr ""
-"Trotz %d-fachen Versuches konnte die Erzeugung eines unsicheren Schlüssels für "
-"sym. Verschlüsselung nicht vermieden werden!\n"
+"Trotz %d-fachen Versuches konnte die Erzeugung eines unsicheren Schlüssels "
+"für sym. Verschlüsselung nicht vermieden werden!\n"
 
 #: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
@@ -6535,6 +6547,10 @@ msgstr "Option \"%.50s\" ist mehrdeutig\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "Befehl \"%.50s\" ist mehrdeutig\n"
 
+#: jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "Nicht genügend Speicher\n"
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6627,19 +6643,19 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlisten exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Der RSA Modulus fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Der öffentliche Exponent fehlt oder ist zu groß (mehr als %d Bit)\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
@@ -6695,7 +6711,7 @@ msgstr ""
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
@@ -6715,15 +6731,15 @@ msgstr "Das Erzeugungsdatum konnte nicht gespeichert werden: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "Lesen des öffentlichen Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "Die Antwort enthält keine öffentliche Schlüssel-Daten\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "Die Antwort enthält das RSA-Modulus nicht\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
@@ -6744,144 +6760,143 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Bitte die PIN eingeben%%0A[Sigs erzeugt: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 msgid "||Please enter the PIN"
 msgstr "||Bitte die PIN eingeben"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN für CHV%d ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "Fehler beim Holen des CHV-Status' von der Karte\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Noch %d Admin-PIN-Versuche, bis die Karte dauerhaft gesperrt ist\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "|A|Bitte die Admin-PIN eingeben.%%0A[Verbliebene Versuche: %d]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
+
+#: scd/app-openpgp.c:1990
 msgid "||Please enter the Reset Code for the card"
 msgstr "Bitte geben Sie den Rückstellcode für diese Karte ein"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Der Rückstellcode ist zu kurz; die Mindestlänge beträgt %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Die RSA Primzahl %s fehlt oder ist nicht %d Bits lang\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr "Der Fingerabdruck auf der Karte entspricht nicht dem angeforderten.\n"
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Die Hashmethode %s wird von der Karte nicht unterstützt\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN ist momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -6897,51 +6912,51 @@ msgstr "||Bitte die PIN auf der Tastatur des Kartenlesers eingeben"
 msgid "|N|Initial New PIN"
 msgstr "|N|Erstmalige neue PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "Im Multiserver Modus ausführen"
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NAME|Die Debugstufe auf NAME setzen"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|DATEI|Schreibe Logs auf DATEI"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|Verbinde mit dem Leser auf Port N"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|Benutze NAME als CT-API Treiber"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|Benutze NAME als PC/SC Treiber"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "Den internen CCID Treiber nicht benutzen"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|Schalte die Karte nach N Sekunden Inaktivität ab"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "Die Tastatur des Kartenlesers nicht benutzen"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 msgid "deny the use of admin card commands"
 msgstr "Verweigere die Benutzung von \"Admin\"-Befehlen"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Aufruf: scdaemon [Optionen] (-h für Hilfe)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6949,7 +6964,7 @@ msgstr ""
 "Syntax: scdaemon [Optionen] [Befehl [Argumente]]\n"
 "Smartcard Daemon für GnuPG\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Bitte die Option `--daemon' nutzen, um das Programm im Hintergund "
@@ -7058,7 +7073,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "Schlüsselsuche im Cache des Dirmngr schlug fehl: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "Ein keyDB Handle konnte nicht bereitgestellt werden\n"
 
@@ -7517,135 +7532,135 @@ 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:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "Keine gültigen Empfänger angegeben\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "Externe Schlüssel anzeigen"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "Schlüssel mit Zertifikatekette anzeigen"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "Zertifikate importieren"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "Zertifikate exportieren"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "Smartcard registrieren"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "Das Kommando an den Dirmngr durchreichen"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "Rufe das gpg-protect-tool auf"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "Die Passphrase ändern"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "Ausgabe im Basis-64 Format erzeugen"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "Eingabedaten sind im PEM Format"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "Eingabedaten sind im Basis-64 Format"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "Eingabedaten sind im Binärformat"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "Benutze den System Dirmngr falls verfügbar"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "Niemals eine CRL konsultieren"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "Die Gültigkeit mittels OCSP prüfen"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|Sende N Zertifikate mit"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|DATEI|Richtlinieninformationen DATEI entnehmen"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "Zertifikatsrichtlinien nicht überprüfen"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "Fehlende Zertifikate automatisch holen"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "das Terminal gar nicht benutzen"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|DATEI|Schreibe im Servermodus Logs auf DATEI"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DATEI|Schreibe ein Audit-Log auf DATEI"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "Stapelmodus: Keine Abfragen"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "\"Ja\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "\"Nein\" als Standardantwort annehmen"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DATEI|DATEI als öffentlichen Schlüsselbund mitbenutzen"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|USER-ID als voreingestellten Schlüssel benutzen"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|Schlüssel bei diesem Server nachschlagen"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|Verschlüsselungsverfahren NAME benutzen"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|Hashverfahren NAME benutzen"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Aufruf: gpgsm [Optionen] [Dateien] (-h für Hilfe)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7654,58 +7669,54 @@ msgstr ""
 "Syntax: gpgsm [Optionen] [Dateien]\n"
 "Signieren, prüfen, ver- und entschlüsseln mittels S/MIME Protokoll\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "Aufruf: gpgsm [Optionen] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Unbekanntes Gültigkeitsmodell '%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: Kein Server-Name angegeben\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: Passwort ohne Benutzer\n"
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: Zeile wird übersprungen\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 msgid "could not parse keyserver\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "Dieser Befehl wurde noch nicht implementiert\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
 
@@ -7890,7 +7901,7 @@ msgstr "                alias"
 msgid "This is a qualified signature\n"
 msgstr "Dies ist eine qualifizierte Unterschrift.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "Reduzierte Informationen"
 
@@ -8120,55 +8131,55 @@ msgstr "Die externe Überprüfung der Komponente %s war nicht erfolgreich"
 msgid "Note that group specifications are ignored\n"
 msgstr "Beachten Sie, daß Gruppenspezifiaktionen ignoriert werden\n"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "Liste aller Komponenten"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr "Prüfe alle Programme"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENTE|Zeige die Optionen an"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENTE|Ändere die Optionen"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENTE|Prüfe die Optionen"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr "Wende die gobalen Voreinstellungen an"
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr "Hole die Einstelungsverzeichnisse von gpgconf"
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 msgid "list global configuration file"
 msgstr "Zeige die globale Konfigurationsdatei an"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "Prüfe die globale Konfigurationsdatei"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "Als Ausgabedatei benutzen"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "Aktiviere Änderungen zur Laufzeit; falls möglich"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Aufruf: gpgconf [Optionen] (-h für Hilfe)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -8176,19 +8187,19 @@ msgstr ""
 "Syntax: gpgconf {Optionen]\n"
 "Verwalte Konfigurationsoptionen für Programme des GnuPG Systems\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "Aufruf: gpgconf [Optionen] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "Benötige ein Komponentenargument"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "Komponente nicht gefunden"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "Argumente sind nicht erlaubt"
 
@@ -8236,8 +8247,8 @@ msgid ""
 "[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
-"Syntax: symcryptrun --class KLASSE --program PROGRAMM --"
-"keyfile SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
+"Syntax: symcryptrun --class KLASSE --program PROGRAMM --keyfile "
+"SCHLUESSELDATEI [Optionen...] KOMMANDO [Eingabedatei]\n"
 "Aufruf eines einfachen symmetrischen Verschlüsselungstool\n"
 
 #: tools/symcryptrun.c:279
@@ -8372,6 +8383,12 @@ msgstr ""
 "Syntax: gpg-check-pattern [optionen] Musterdatei\n"
 "Die von stdin gelesene Passphrase gegen die Musterdatei prüfen\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Das DSA-Schlüsselpaar wird %u Bit haben.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "Dieser Befehl wurde noch nicht implementiert\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Geben Sie die Passphrase nochmal ein\n"
 
@@ -8383,9 +8400,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|Admin-PIN"
 
-#~ msgid "[none]"
-#~ msgstr "[keine]"
-
 #~ msgid "read options from file"
 #~ msgstr "Konfigurationsoptionen aus Datei lesen"
 
diff --git a/po/el.po b/po/el.po
index 54b76670b..c89cf5303 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <madf@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -19,70 +19,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -92,79 +92,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �������� ����������� hashtable: %s\n"
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -313,263 +313,263 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "��������� �� ���������� ��� <gnupg-bugs@gnu.org>\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,8 +586,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -595,8 +595,8 @@ msgstr ""
 "@�������:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -607,91 +607,91 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "������ ���������: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -703,19 +703,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -727,7 +727,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -737,11 +737,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -807,40 +807,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[User id ��� �������]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "�������� ������������ �� �� gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
@@ -1077,6 +1077,11 @@ msgstr "
 msgid "ignoring garbage line"
 msgstr "������ ��� ������ trailer\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "�������"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1188,7 +1193,7 @@ msgstr "
 msgid "not human readable"
 msgstr "�� ����������"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "�� ������� ������ ��� ����� ���������"
@@ -1198,8 +1203,8 @@ msgstr "
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
@@ -1209,170 +1214,170 @@ msgstr "
 msgid "This command is only available for version 2 cards\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "� ������� ���; "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "��� ���� ������� �����"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "�� �������������"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "������ ��������� ������� ������: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "����������� ��������"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�� ������� ���������� ��� \"�������\" ��� ��������\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "������: �� ������ ���������\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1380,140 +1385,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�� ������ �������.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "�������� ���������� ����������\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "������ ��������� ���: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "������ ��� ����������� �����"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "������> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -1521,7 +1526,7 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
@@ -1847,37 +1852,37 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[������]|���������� ���� �� ���������������� ���������"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "���������� ���� �� ������������� ���������"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "������������� ���������"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "������������� �� ����� ���� ����������� ����������"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "���������������� ��������� (��������������)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "���������� ���� ���������"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "���������� ��� ������ ��������"
 
@@ -1890,11 +1895,11 @@ msgstr "
 msgid "list and check key signatures"
 msgstr "������� ��������� ��������"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "���������� ��� ������ �������� ��� ������������ (fingerprints)"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "���������� ��� ������ �������� ��������"
 
@@ -1902,7 +1907,7 @@ msgstr "
 msgid "generate a new key pair"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "�������� ��� �������� ��� �� ������� ����������"
 
@@ -1930,11 +1935,11 @@ msgstr "
 msgid "export keys"
 msgstr "������� ��������"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "������� �������� �� ��� ���������� ��������"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "�������� �������� ��� ��� ���������� ��������"
 
@@ -1971,20 +1976,20 @@ msgstr "
 msgid "print message digests"
 msgstr "|����� [������]| ���������� ���������� ��� ���������"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|�����|������������� ��� �����"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "����� ����� ��� ���������� (user id) ��� �������� � ����������������"
@@ -1998,12 +2003,12 @@ msgstr "|N|
 msgid "use canonical text mode"
 msgstr "����� ��������� ���������� ��������"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "�� �� ����� ������ ������"
 
@@ -2015,7 +2020,7 @@ msgstr "
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2023,7 +2028,7 @@ msgstr ""
 "@\n"
 "(����� �� ������ man ��� ��� ����� ����� ������� ��� ��������)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2061,7 +2066,7 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2089,7 +2094,7 @@ msgstr "
 msgid "usage: gpg [options] "
 msgstr "�����: gpg [��������] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "������������� �������\n"
 
@@ -2168,469 +2173,469 @@ msgstr "
 msgid "unknown configuration item `%s'\n"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "���������� ��� ����������� ���� ����� ��������� �� ������"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2644,7 +2649,7 @@ msgstr "
 msgid "make timestamp conflicts only a warning"
 msgstr "������� ��� ����������� ���� (timestamp) ���� ��� �������������"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|������� ��� ����������� ���������� ��� FD"
 
@@ -3460,20 +3465,20 @@ msgstr "
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
@@ -3490,7 +3495,7 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
@@ -4302,12 +4307,12 @@ msgid "writing key binding signature\n"
 msgstr "������� ��������� \"�������\" ��������\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�� ������ ������� ��������, ����� %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@ -4378,76 +4383,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "�������� �������� ��� ���� ��� �������� ��� ������:\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA ��� ElGamal (��������������)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (��� ������������� ����)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (��� ������������� ����)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��� �������� ����)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (��� ������������� ����)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (��� ������������� ����)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (��� ������������� ����)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�� ������� �������� �� ������; (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�� ������� �������� �� ������; (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�� ������� �������� ��� �������� ����� %u bits\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4463,7 +4473,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4479,40 +4489,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4520,12 +4530,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4536,7 +4546,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4553,44 +4563,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4601,7 +4611,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4616,23 +4626,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:2105
+#: g10/keygen.c:2145
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4640,12 +4650,19 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4657,7 +4674,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4669,50 +4686,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4723,12 +4740,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4736,7 +4753,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4744,28 +4761,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -5301,66 +5318,66 @@ msgstr ""
 "� ������������ ��� ���������� ��������� %s (%d) ���������� ���\n"
 "����������� ��� ���������\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "�� ����� ��� ��������������� IDEA ��� �������\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = ���������� ������������ �����������\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: �� ������������ ������� \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "�������� �������������� �� \"%s%s\" ��������\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�������������: \"%s\" ����� ��� �� ������������ �������\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "����������"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "����������"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���� �� ������ ���� ��� ������ �� �������������� ��� %s\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
@@ -5404,26 +5421,26 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "�������������: �� �������� ��� `%s' ��� ����� ������� �� ���� ��� ��������\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5437,25 +5454,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s ������, ID %08lX, ���������� %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "�������������� �� ����� ������\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "��������� ��� �� ������\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "�� �������������"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5465,12 +5477,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6652,6 +6664,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "�� �������������"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6744,19 +6761,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6805,7 +6822,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -6825,15 +6842,15 @@ msgstr "
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6852,150 +6869,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -7011,63 +7027,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|�����|����� ��� �������� �� ��������������� ���������"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�� ����� ����������"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "������������� �������\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7175,7 +7191,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
@@ -7640,147 +7656,147 @@ msgstr "
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "���������� ��� ������ �������� ��������"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "���� �������������"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "������ ��� ������ ������"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "���������� ascii ������������ ������"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "�� ����� ����������"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "��������� batch: �� �� �������� ���������"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "�������� ��� ���� ������������ ���������"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "�������� ����� ��� �������� ��� ����� ��� �����������"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|�����|����� �������� ��� �������������� ������� ������"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|�����������|����� ����� ��� ���������� �������� ��� ���������"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|�����|����� ���������� �������������� �����"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|�����|����� ���������� ��������� ��������� ����� "
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7791,60 +7807,56 @@ msgstr ""
 "��������, �������, ������������� � ����������������\n"
 "� �������������� ���������� ��������� ��� �� �������� �������\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�����: gpg [��������] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "�������� �������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "�������� ��������������� ���������� `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(��� ������ ���������)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = ��������� ����� ��� ��������\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8020,7 +8032,7 @@ msgstr ""
 "\n"
 "���� �� ����� ��� ����-��������.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "�����������"
@@ -8255,78 +8267,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "������� ����������� ��������� \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "����� �� ������� ������"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�����: gpg [��������] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "��� ������� �� ������� ������"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
@@ -8512,13 +8524,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "�� ������ �������� DSA �� ����� 1024 bits.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "����������� �� �����\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "�������"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "�������� �������� ��� `%s'\n"
diff --git a/po/eo.po b/po/eo.po
index c4d9da71b..198c11b97 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <edmundo@rano.org>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -19,70 +19,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -92,79 +92,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: malsukcesis krei haktabelon: %s\n"
@@ -303,7 +303,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -314,262 +314,262 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Bonvolu raporti cimojn al <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,8 +586,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -595,8 +595,8 @@ msgstr ""
 "@Komandoj:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -607,91 +607,91 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kiraso: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -703,19 +703,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -727,7 +727,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -737,11 +737,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -807,40 +807,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "%s: uzanto ne trovita\n"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ne estas disponata en �i tiu sesio\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ne povas konekti�i al '%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "komunikproblemo kun gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
@@ -1082,6 +1082,11 @@ msgstr "Nenia helpo disponata por '%s'"
 msgid "ignoring garbage line"
 msgstr "eraro en vostolinio\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "nekonata versio"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1195,7 +1200,7 @@ msgstr "AVERTO: nevalida notacia dateno trovita\n"
 msgid "not human readable"
 msgstr "ne homlegebla"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "sekreta �losilo ne havebla"
@@ -1205,8 +1210,8 @@ msgstr "sekreta 
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1216,170 +1221,170 @@ msgstr "ne povas fari tion en neinteraga re
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Via elekto? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "en"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "en"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenia kialo specifita"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "ne traktita"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualigitaj preferoj"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "nevalida signo en signo�eno\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Fingrospuro:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: nevalida dosiero-versio %d\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1387,140 +1392,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Bonvolu elekti, kian �losilon vi deziras:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Nevalida elekto.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Kialo por revoko: "
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nekonata densig-metodo"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenia helpo disponata"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "�an�i la daton de eksvalidi�o"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "�an�i la posedantofidon"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "krei novan �losilparon"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Komando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -1528,7 +1533,7 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
@@ -1835,37 +1840,37 @@ msgstr "uzas flankan 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[dosiero]|fari klartekstan subskribon"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "fari apartan subskribon"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "�ifri datenojn"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "�ifri nur kun simetria �ifro"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "mal�ifri datenojn (implicita elekto)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "kontroli subskribon"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "listigi �losilojn"
 
@@ -1878,11 +1883,11 @@ msgstr "listigi 
 msgid "list and check key signatures"
 msgstr "kontroli �losilsubskribojn"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "listigi �losilojn kaj fingro�purojn"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "listigi sekretajn �losilojn"
 
@@ -1890,7 +1895,7 @@ msgstr "listigi sekretajn 
 msgid "generate a new key pair"
 msgstr "krei novan �losilparon"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "forigi �losilojn de la publika �losilaro"
 
@@ -1918,11 +1923,11 @@ msgstr "krei revokatestilon"
 msgid "export keys"
 msgstr "eksporti �losilojn"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "eksporti �losilojn al �losilservilo"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importi �losilojn de �losilservilo"
 
@@ -1959,20 +1964,20 @@ msgstr "aktualigi la fido-datenaron"
 msgid "print message digests"
 msgstr "|metodo [dosieroj]|presi mesa�o-kompendiojn"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOMO|�ifri por NOMO"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "uzi �i tiun uzantidentigilon por subskribi a� mal�ifri"
@@ -1986,12 +1991,12 @@ msgstr "|N|difini densig-nivelon N (0=nenia)"
 msgid "use canonical text mode"
 msgstr "uzi tekstan re�imon"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "fari neniajn �an�ojn"
 
@@ -2003,7 +2008,7 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2011,7 +2016,7 @@ msgstr ""
 "@\n"
 "(Vidu la manpa�on por kompleta listo de �iuj komandoj kaj opcioj)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2049,7 +2054,7 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2078,7 +2083,7 @@ msgstr "Komento: "
 msgid "usage: gpg [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "malkongruaj komandoj\n"
 
@@ -2154,468 +2159,468 @@ msgstr "Averto: malsekuraj permesoj sur %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "montri, en kiu �losilaro estas listigita �losilo"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, fuzzy, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 #, 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:3161
+#: g10/gpg.c:3156
 #, 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2630,7 +2635,7 @@ msgstr "
 msgid "make timestamp conflicts only a warning"
 msgstr "malkongruo de tempostampoj"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skribi statusinformojn al FD (dosierpriskribilo)"
 
@@ -3446,20 +3451,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Sekretaj partoj de �efa �losilo ne estas disponataj.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
@@ -3476,7 +3481,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -4279,12 +4284,12 @@ msgid "writing key binding signature\n"
 msgstr "skribas �losilbindan subskribon\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "�losilgrando nevalida; uzas %u bitojn\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
@@ -4355,76 +4360,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA kaj ElGamal (implicita elekto)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (nur subskribi)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (nur �ifri)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (nur �ifri)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (nur subskribi)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (nur �ifri)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (nur �ifri)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (nur �ifri)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-�losilparo havos 1024 bitojn.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Kiun �losilgrandon vi deziras? (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Kiun �losilgrandon vi deziras? (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Petita �losilgrando estas %u bitoj\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4440,7 +4450,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4456,40 +4466,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4497,12 +4507,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4513,7 +4523,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4529,44 +4539,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4577,7 +4587,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4592,23 +4602,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4616,12 +4626,19 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Bonvolu doni la pasfrazon; tio estas sekreta frazo \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4633,7 +4650,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4645,50 +4662,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4697,12 +4714,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4710,7 +4727,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4718,26 +4735,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -5276,67 +5293,67 @@ msgstr "%s-subskribo de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTO: �ifrad-metodo %d ne trovita en preferoj\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "la aldona�o por la �ifro IDEA en �eestas\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = bonvolu montri pli da informoj\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 #, fuzzy
 msgid "Uncompressed"
 msgstr "ne traktita"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "ne traktita"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
@@ -5379,26 +5396,26 @@ msgstr "%s: nova opcio-dosiero kreita\n"
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5411,25 +5428,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bita %s �losilo, ID %08lX, kreita je %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Donu pasfrazon\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "nuligita de uzanto\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "ne traktita"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5439,12 +5451,12 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6604,6 +6616,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ne traktita"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6696,19 +6713,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6757,7 +6774,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -6777,15 +6794,15 @@ msgstr "malsukcesis rekonstrui 
 msgid "reading public key failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6804,150 +6821,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -6964,63 +6980,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Donu la uzantidentigilon: "
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMO|uzi NOMOn kiel implicitan ricevonton"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "tute ne uzi la terminalon"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "malkongruaj komandoj\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7128,7 +7144,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7606,147 +7622,147 @@ msgstr "ripetita atestilo - forvi
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nevalida respondo de agento\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "listigi sekretajn �losilojn"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Valida atestilrevoko"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "Bona atestilo"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "krei eligon en askia kiraso"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "tute ne uzi la terminalon"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "neinteraga re�imo: neniam demandi"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "supozi \"jes\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "supozi \"ne\" �e la plej multaj demandoj"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "aldoni �i tiun �losilaron al la listo de �losilaroj"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOMO|uzi NOMOn kiel la implicitan sekretan �losilon"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SERVILO|uzi �i tiun �losilservilon por ser�i �losilojn"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMO|uzi �ifrad-metodon NOMO"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMO|uzi kompendi-metodon NOMO"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7757,60 +7773,56 @@ msgstr ""
 "subskribi, kontroli, �ifri a� mal�ifri\n"
 "implicita operacio dependas de la enigataj datenoj\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nekonata implicita ricevonto '%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = supersalti �i tiun �losilon\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7984,7 +7996,7 @@ msgstr "            alinome \""
 msgid "This is a qualified signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "fini"
@@ -8219,78 +8231,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: nova opcio-dosiero kreita\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "uzi dosieron por eligo"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uzado: gpg [opcioj] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "publika �losilo ne trovita"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -8475,13 +8487,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-�losilparo havos 1024 bitojn.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Ripetu pasfrazon\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "nekonata versio"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "legas opciojn el '%s'\n"
diff --git a/po/es.po b/po/es.po
index 0b7a5d567..06d67a2f6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.9\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-12-14 19:34+0100\n"
 "Last-Translator: Jaime Su�rez <jaime@mundocripto.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -25,14 +25,30 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no pude conseguir el bloqueo de entrada de pin: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+msgid "Quality:"
+msgstr "Calidad:"
+
+#. 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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr "barra de calidad, entrada de pin"
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 "Por favor introduzca su PIN para desbloquear la clave secreta de esta sesi�n"
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -40,44 +56,28 @@ msgstr ""
 "Por favor introduzca la frase contrase�a para desbloquear la clave secreta "
 "de esta sesi�n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-msgid "Quality:"
-msgstr "Calidad:"
-
-#. 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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr "barra de calidad, entrada de pin"
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "Frase contrase�a demasiado larga"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inv�lidos en el PIN"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "PIN incorrecto"
 
@@ -90,7 +90,7 @@ msgstr "PIN incorrecto"
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "Frase contrase�a err�nea"
 
@@ -103,7 +103,7 @@ msgstr "Frase contrase
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "Frase contrase�a"
 
@@ -112,68 +112,68 @@ msgstr "Frase contrase
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "no pueden usarse claves ssh de m�s de %d bits\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "no se puede crear %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "error obteniendo el n�mero de serie de la tarjeta: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "detectada tarjeta con S/N: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr ""
 "error obteniendo ID de la clave por defecto para autenticaren la tarjeta: %"
 "s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "no se encuentra una clave de tarjeta adecuada: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "el sombreado de la clave fall�: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "error escribiendo clave: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor introduzca la frase contrase�a para la clave ssh%0A %c"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "Por favor vuelva a introducir frase contrase�a"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -182,12 +182,12 @@ msgstr ""
 "Por favor introduzca una frase contrase�a para proteger la clave "
 "secretarecibida%%0A  %s%%0Aen el almacen de claves del agente gpg"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "no coincide - reint�ntelo"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "fallo al crear un flujo desde el socket: %s\n"
@@ -330,7 +330,7 @@ msgstr "Por favor introduzca frase contrase
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contrase�a"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -339,109 +339,109 @@ msgstr ""
 "@Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "no acaparar teclado y rat�n"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "usar un fichero log para el servidor"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "usar una localizaci�n est�ndar para el socket"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la cach� expiran en N segundos"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el cach� de PINs al firmar"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "permitir que los clientes marquen claves como \"fiables\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contrase�a"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "permitir emulaci�n de ssh-agent"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Por favor, informe de posibles \"bugs\" a <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg-agent [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -449,145 +449,145 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s es demasiado antiguo (necesita %s, tiene %s)\n"
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "error creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "nombre de socket demasiado largo\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "el nombre de socket `%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "ya hay un agente gpg ejecut�ndose - no se inicia otro\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor �nico para el socket\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enlazando el socket con `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fall�: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escuchando el socket `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() fall� para `%s': %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "no puede usar `%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "error leyendo valor �nico en el descriptor %d: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "manejador ssh 0x%lx para el descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select fall�: %s - espero 1s\n"
 
 # msgstr "clave %08lX: %d nuevas subclaves\n"
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr "no hay un agente gpg ejecut�ndose en esta sesi�n\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -609,8 +609,8 @@ msgstr ""
 # 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? :-)
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -618,8 +618,8 @@ msgstr ""
 "@�rdenes:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -630,11 +630,11 @@ msgstr ""
 "Opciones:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg-protect-tool [opciones] (-h para ayuda)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -642,22 +642,22 @@ msgstr ""
 "Sintaxis: gpg-protect-tool [opciones] [args]\n"
 "Herramienta para el mantenimiento de claves secretas\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Introduzca frase contrase�a para desproteger el objeto PKCS#12."
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Introduzca frase contrase�a para proteger el nuevo objeto PKCS#12."
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Introduzca la frase contrase�a para proteger el objeto importado en GnuPG"
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -674,55 +674,55 @@ msgstr ""
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Frase contrase�a:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "cancelado\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "error pidiendo la frase contrase�a: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "error abriendo `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fichero `%s', l�nea %d: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "declaraci�n \"%s\" ignorada en `%s', l�nea %d\n"
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "la lista de confianza `%s' del sistema no est� disponible\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "huella digital incorrecta en `%s', l�nea %d\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "opci�n de clave inv�lida en `%s', l�nea %d\n"
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error leyendo `%s', l�nea %d: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "error leyendo la lista de certificados ra�z fiables\n"
 
@@ -734,7 +734,7 @@ msgstr "error leyendo la lista de certificados ra
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -743,11 +743,11 @@ msgstr ""
 "�Conf�a absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "S�"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "No"
 
@@ -759,7 +759,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -771,11 +771,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "Correcto"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -843,37 +843,37 @@ msgstr "error ejecutando `%s': probablemente no est
 msgid "error running `%s': terminated\n"
 msgstr "error ejecutando `%s': terminado\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "error creando socket: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "host no encontrado"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "el agente gpg no esta disponible en esta sesi�n\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "no se puede conectar con `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con el agente gpg\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema estableciendo opciones de gpg-agent\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "problema con el agente\n"
 
@@ -1092,6 +1092,10 @@ msgstr "No hay ayuda disponible para `%s'."
 msgid "ignoring garbage line"
 msgstr "ignorando l�nea con basura"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[ninguno]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1199,7 +1203,7 @@ msgstr "ATENCI
 msgid "not human readable"
 msgstr "ilegible"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tarjeta OpenPGP no disponible: %s\n"
@@ -1209,8 +1213,8 @@ msgstr "tarjeta OpenPGP no disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1218,159 +1222,159 @@ msgstr "imposible hacer esto en modo de proceso por lotes\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Esta orden solo est� disponible en tarjetas versi�n 2\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr "No hay C�digo de Reinicio o ya no est� disponible\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Su elecci�n: "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[no establecido]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "hombre"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "mujer"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "no especificado"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "no forzado"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "forzado"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Error: s�lo se permite ASCII sin formato actualmente.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Error: El caracter \"<\" no puede usarse.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Error: no se permiten dobles espacios.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Apellido del titular de la tarjeta: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Nombre del titular de la tarjeta: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Error: nombre combinado demasiado largo (m�ximo %d caracteres).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL de donde recuperar la clave p�blica: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Error: URL demasiado larga (el m�ximo son %d caracteres).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "error reservando memoria: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "error leyendo `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Datos de login (nombre de la cuenta): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Error: el login es demasiado largo (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Datos privados: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 "Error: los datos privados son demasiado largos (l�mite de %d caracteres).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Preferencias de idioma: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Error: longitud de la cadena de preferencias inv�lida.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Error: caracteres inv�lidos en cadena de preferencias.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexo ((H)ombre, (M)mujer o espacio): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Error: respuesta no v�lida.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "Huella dactilar CA:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Error: formato inv�lido de huella dactilar.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "la operaci�n con la clave no es posible: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "no es una tarjeta OpenPGP"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "error obteniendo la informaci�n actual de la clave: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "�Reemplazar la clave existente? (s/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 "�Hacer copia de seguridad externa a la tarjeta de clave de cifrado? (S/n)"
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "�Reemplazar las claves existentes? (s/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1381,124 +1385,124 @@ msgstr ""
 "   PIN = `%s'     PIN Administrador = `%s'\n"
 "Deber�a cambiarlos usando la orden --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor seleccione tipo de clave que generar:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "    (1) Clave de firmado\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Clave de cifrado\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Clave de autentificaci�n\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Elecci�n inv�lida.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Por favor elija donde guardar la clave:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n de clave desconocido\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "las partes secretas de la clave no est�n disponibles\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "clave secreta ya almacenada en una tarjeta\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sale de este men�"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "listar todos los datos disponibles"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "cambiar el nombre del titular de la tarjeta"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "cambiar URL de donde obtener la clave"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "recuperar la clave especificada en la URL de la tarjeta"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "cambiar nombre de usuario"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "cambiar preferencias de idioma"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "cambiar sexo del titular de la tarjeta"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "cambiar huella dactilar de una CA"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "cambiar estado de la opci�n forzar firma del PIN"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "generar nuevas claves"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "men� para cambiar o desbloquear el PIN"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "verificar PIN y listar todos los datos"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr "desbloquear PIN usando C�digo de Reinicio"
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Orden> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "�rdenes s�lo de administrador\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -1506,7 +1510,7 @@ msgstr "Orden inv
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
@@ -1812,35 +1816,35 @@ msgstr "usando subclave %s en vez de clave primaria %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 msgid "make a signature"
 msgstr "crea una firma"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 msgid "make a clear text signature"
 msgstr "crea una firma en texto claro"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "crea una firma separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "cifra datos"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "cifra s�lo con un cifrado sim�trico"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "descifra datos (predefinido)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "lista claves"
 
@@ -1852,11 +1856,11 @@ msgstr "lista claves y firmas"
 msgid "list and check key signatures"
 msgstr "lista y comprueba firmas de las claves"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "lista claves y huellas dactilares"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "lista claves secretas"
 
@@ -1864,7 +1868,7 @@ msgstr "lista claves secretas"
 msgid "generate a new key pair"
 msgstr "genera un nuevo par de claves"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "elimina claves del anillo p�blico"
 
@@ -1892,11 +1896,11 @@ msgstr "genera un certificado de revocaci
 msgid "export keys"
 msgstr "exporta claves"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exporta claves a un servidor de claves"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importa claves desde un servidor de claves"
 
@@ -1932,19 +1936,19 @@ msgstr "actualiza la base de datos de confianza"
 msgid "print message digests"
 msgstr "imprime res�menes de mensaje"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|ID-USUARIO|cifra para ID-USUARIO"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|ID-USUARIO|usa este identificador para firmar o descifrar"
 
@@ -1956,11 +1960,11 @@ msgstr "|N|nivel de compresi
 msgid "use canonical text mode"
 msgstr "usa modo de texto can�nico"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr "|FICHERO|volcar salida en FICHERO"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "no hace ning�n cambio"
 
@@ -1976,7 +1980,7 @@ msgstr "usar estilo OpenPGP estricto"
 # 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:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1984,7 +1988,7 @@ msgstr ""
 "@\n"
 "(V�ase en la p�gina del manual la lista completo de �rdenes y opciones)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2022,7 +2026,7 @@ msgstr ""
 "firma, comprueba, cifra o descifra\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2050,7 +2054,7 @@ msgstr "Compresi
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opciones] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "�rdenes incompatibles\n"
 
@@ -2132,427 +2136,427 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "art�culo de configuraci�n desconocido `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "mostrar foto IDs al listar claves"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "mostrar URLS de pol�tica al listar firmas"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "mostrar todas las notaciones al listar firmas"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "mostrar notaciones est�ndar IETF al listar firmas"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "mostrar notaciones personalizadas al listar firmas"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "mostrar URL del servidor de claves preferido al listar firmas"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "mostrar validez de la ID de usuario al listar claves"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr "mostar IDs de usuario revocados y caducados al listar firmas"
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "mostrar subclaves revocadas y expiradas al listar claves"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "mostrar nombre de los anillos de claves al listar claves"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "mostrar fechas de caducidad al listar firmas"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es una fecha de caducidad v�lida\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de pol�tica al verificar firmas"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, 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:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2560,19 +2564,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:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2588,7 +2592,7 @@ msgstr "|FICHERO|tomar las claves del anillo FILE"
 msgid "make timestamp conflicts only a warning"
 msgstr "hacer que los conflictos de fecha-hora sean s�lo un aviso"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribe informaci�n de estado en este descriptor de fichero"
 
@@ -3370,19 +3374,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Las partes secretas de la clave primaria se guardan en la tarjeta.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
@@ -3399,7 +3403,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
@@ -4149,12 +4153,12 @@ msgid "writing key binding signature\n"
 msgstr "escribiendo la firma de comprobaci�n de clave\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de clave incorrecto; se usar�n %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
@@ -4225,76 +4229,81 @@ msgstr "   (%c) Conmutar la capacidad de autentificaci
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Acabado\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA y ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA y ElGamal (por defecto)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (permite elegir capacidades)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (s�lo cifrar)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s�lo firmar)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (s�lo cifrar)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s�lo cifrar)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (permite elegir capacidades)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (permite elegir capacidades)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "El par de claves DSA tendr� %u bits.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�De qu� tama�o quiere la clave? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4310,7 +4319,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4326,38 +4335,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4365,11 +4374,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4383,7 +4392,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4399,44 +4408,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4447,7 +4456,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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 "
@@ -4464,23 +4473,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4488,12 +4497,20 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Introduzca la frase contrase�a para proteger el objeto importado en GnuPG"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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 +4522,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4518,50 +4535,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4569,12 +4586,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4582,7 +4599,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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4590,25 +4607,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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, 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:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -5133,65 +5150,65 @@ msgstr "AVISO: usando algoritmo de resumen experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVISO: el algoritmo de resumen %s est� obsoleto\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "el plugin para el cifrado IDEA no est� presente\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "por favor vea %s para m�s informaci�n\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n obsoleta \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor use \"%s%s\" en su lugar\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "ATENCI�N: \"%s\" es una orden obsoleta - no la use\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: opci�n obsoleta \"%s\" - no tiene efecto\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ATENCI�N: \"%s\" es una opci�n obsoleta - no tiene efecto\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Sin comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "sin_comprimir|ninguno"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "opci�n ambigua `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "opci�n desconocida `%s'\n"
@@ -5233,27 +5250,27 @@ msgstr "creado un nuevo fichero de configuraci
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5268,24 +5285,20 @@ msgstr ""
 "con %u bits clave %s, ID %s,\n"
 "creada el %s%s.\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Introduzca frase contrase�a\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "cancelado por el usuario\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-msgid "out of core\n"
-msgstr "memoria desbordada\n"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5294,12 +5307,12 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "clave %2$s de %1$u bits, ID %3$s, creada el %4$s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
@@ -6452,6 +6465,10 @@ msgstr "la opci
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "la orden \"%.50s\" es ambigua\n"
 
+#: jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "memoria desbordada\n"
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6544,19 +6561,19 @@ msgstr ""
 "Sintaxis: kbxutil [opciones] [ficheros]\n"
 "listar, exportar, importar datos Keybox\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "falta el m�dulo RSA o no es de %d bits\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "falta el exponente p�blico RSA o es mayor de %d bits\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
@@ -6605,7 +6622,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
@@ -6625,15 +6642,15 @@ msgstr "fallo guardando la fecha de creaci
 msgid "reading public key failed: %s\n"
 msgstr "fallo leyendo clave p�blica: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "la respuesta no incluye la clave p�blica\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "la respuesta no incluye el m�dulo RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
@@ -6652,148 +6669,147 @@ msgstr "fallo al usar el PIN por defecto %s: %s - en adelante deshabilitado\n"
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Por favor introduzca PIN%%0A[firmas hechas: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 msgid "||Please enter the PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "El PIN para CHV%d es demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "el acceso a �rdenes de administrador no est� configurado\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "error recuperando el estatus CHV de la tarjeta\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d intentos quedan para PIN de administrador antes de "
 "bloquearpermanentemente la clave\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Introduzca PIN de Administrador en el teclado del lector%%0A[intentos "
 "restantes %d]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "el acceso a �rdenes de administrador no est� configurado\n"
+
+#: scd/app-openpgp.c:1990
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca C�digo de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "C�digo de Reinicio demasiado corto; longitud m�nima %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr "|CR|Nuevo C�digo de Reinicio"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creaci�n\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "el primo RSA %s falta o no es de %d bits\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr "la huella digital en la tarjeta no coincide con la solicitada\n"
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "la tarjeta no permite usar el algoritmo de resumen %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "actualmente se prohibe verificar el PIN del Administrador con esta orden\n"
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -6809,52 +6825,52 @@ msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
 msgid "|N|Initial New PIN"
 msgstr "|N|Nuevo PIN Inicial"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "ejecutar en modo multi servidor (primer plano)"
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVEL|poner el nivel de depurado a NIVEL"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHERO|escribir log en FICHERO"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|conectar el lector al puerto N"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOMBRE|usa NOMBRE como driver ct-API"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOMBRE|usa NOMBRE como driver PC/SC"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "no usa el driverd del CCID interno"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|desconectar la tarjeta despu�s de N segundos de inactividad"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "no usa el teclado del lector"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "permitir �rdenes de administrador en la tarjeta"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: scdaemon [opciones] [ficheros] (-h para ayuda)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6862,7 +6878,7 @@ msgstr ""
 "Sintaxis: scdaemon [opciones] [orden [args]]\n"
 "Demonio de la tarjeta inteligente para GnuPG\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "use la opci�n `--daemon' para ejectuar el programa en segundo plano\n"
 
@@ -6967,7 +6983,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "fallo buscando la clave s�lo cach� de dirmngr: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "fallo al colocar handle de keyDB\n"
 
@@ -7409,99 +7425,99 @@ msgstr "certificado `%s' borrado\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borrado del certificado \"%s\" fallido: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "no se dieron receptores v�lidos\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "lista claves externas"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "lista de cadenas de certificados"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "importa certificado"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "exporta certificado"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "registrar tarjeta inteligente"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "pasar una orden a dirmngr"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "invocar gpg-protect-tool"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "cambia una frase contrase�a"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "crea una salida en base-64"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "asumir entrada en formato PEM"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "asumir entrada en formato base-64"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "asumir entrada en formato binario"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "usar el dirmngr del sistema si est� disponible"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "nunca consultar una CRL"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "comprabar validez usando OCSP"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|n�mero de certificados que incluir"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|FICHERO|tomar pol�tica de informaci�n de FICHERO"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "no comprobar pol�ticas de certificados"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "recuperar certificados de emisor perdidos"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "no usa la terminal en absoluto"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FICHERO|escribir un log en modo servidor en FICHERO"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHERO|escribir inform de auditor�a a FICHERO"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "proceso por lotes: nunca preguntar"
 
@@ -7511,39 +7527,39 @@ 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:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "asume \"s�\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "asume \"no\" en casi todas las preguntas"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FICHERO|a�ade este anillo a la lista de anillos"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|ID-USUARIO|usa ID-USUARIO como clave secreta por defecto"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ESPEC|usa este servidor para buscar claves"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOMBRE|usa el algoritmo de cifrado NOMBRE"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOMBRE|usa algoritmo de resumen de mensaje NOMBRE"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgsm [opciones] [ficheros] (-h para ayuda)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7553,58 +7569,54 @@ msgstr ""
 "firma, comprueba, cifra o descifra usando protocolo S/MIME\n"
 "la operaci�n por defecto depende de los datos de entrada\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpgsm [opciones] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "NOTA: no se podr� cifrar a `%s': %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "modelo de validaci�n desconocido `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: falta el nombre del host\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: se dio contrase�a sin usuario\n"
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: omitir esta l�nea\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 msgid "could not parse keyserver\n"
 msgstr "no se puede interpretar el servidor de claves\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importando certificados comunes `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no puedo firmar usando `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "esta orden no est� a�n implementada\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inv�lida (no hay orden impl�cita)\n"
 
@@ -7781,7 +7793,7 @@ msgstr "                alias"
 msgid "This is a qualified signature\n"
 msgstr "Es una firma cualificada\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "silencioso"
 
@@ -8009,55 +8021,55 @@ msgstr "Verificaci
 msgid "Note that group specifications are ignored\n"
 msgstr "Note que las especificaci�n de grupo se ignoran\n"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "listar todos los componentes"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr "comprobar todos los programas"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENTE|lista de opciones"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENTE|cambiar opciones"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENTE|comprobar opciones"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr "aplicar valores globales por defecto"
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr "obtener directorios de configuraci�n para gpgconf"
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 msgid "list global configuration file"
 msgstr "listar fichero de configuraci�n global"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "comprobar fichero global de configuraci�n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "usa como fichero de salida"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "activar cambios en tiempo de ejecuci�n, si es posible"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpgconf [opciones] (-h para ayuda)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -8065,19 +8077,19 @@ msgstr ""
 "Sintaxis: gpgconf [opciones]\n"
 "Administrar opciones de configuraci�n de las herramientas GnuPG\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpgconf [opciones] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "Necesita un argumento de un componente"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "Componente no encontrado"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "No se permiten par�metros"
 
@@ -8267,6 +8279,12 @@ msgstr ""
 "Compara frase contrase�a dada en entrada est�ndar con un fichero de "
 "patrones\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "El par de claves DSA tendr� %u bits.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "esta orden no est� a�n implementada\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Repita frase contrase�a\n"
 
@@ -8277,9 +8295,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|PIN Administrador"
 
-#~ msgid "[none]"
-#~ msgstr "[ninguno]"
-
 #~ msgid "read options from file"
 #~ msgstr "leyendo opciones desde fichero"
 
diff --git a/po/et.po b/po/et.po
index 7dbf008e8..62970c033 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -19,70 +19,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -92,79 +92,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: paisktabeli loomine eba�nnestus: %s\n"
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -313,262 +313,262 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Palun saatke veateated aadressil <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -585,8 +585,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -594,8 +594,8 @@ msgstr ""
 "@K�sud:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -606,91 +606,91 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Palun sisestage parool; see on salajane tekst \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "viga lugemisel: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -702,19 +702,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -726,7 +726,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -736,11 +736,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -806,40 +806,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[Kasutaja id puudub]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "ei �nnestu luua �hendust serveriga `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "probleem gpg-agent programmiga suhtlemisel\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
@@ -1076,6 +1076,11 @@ msgstr "`%s' kohta abiinfo puudub"
 msgid "ignoring garbage line"
 msgstr "viga l�petaval real\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "tundmatu"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1186,7 +1191,7 @@ msgstr "HOIATUS: leidsin vigased noteerimise andmed\n"
 msgid "not human readable"
 msgstr "pole inimese poolt loetav"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salajane v�ti ei ole k�ttesaadav"
@@ -1196,8 +1201,8 @@ msgstr "salajane v
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1207,170 +1212,170 @@ msgstr "seda ei saa teha pakettmoodis\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Teie valik? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "P�hjus puudub"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "ei t��deldud"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "vastavat avalikku v�tit pole: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "uuendatud eelistused"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "lubamatu s�mbol eelistuste s�nes\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "viga: vigane s�rmej�lg\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1378,140 +1383,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Palun valige, millist v�tmet��pi te soovite:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allkiri aegus %s\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Vigane valik.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tundmatu kaitsealgoritm\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "V�tme leiate: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "muuda aegumise kuup�eva"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuda omaniku usaldust"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "K�sklus> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -1519,7 +1524,7 @@ msgstr "Vigane k
 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:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
@@ -1838,37 +1843,37 @@ msgstr "kasutan sekundaarset v
 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fail]|loo avateksti allkiri"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "loo eraldiseisev allkiri"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "kr�pteeri andmed"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "kr�pteerimine kasutades ainult s�mmeetrilist �ifrit"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "dekr�pteeri andmed (vaikimisi)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "kontrolli allkirja"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "n�ita v�tmeid"
 
@@ -1881,11 +1886,11 @@ msgstr "n
 msgid "list and check key signatures"
 msgstr "kontrolli v�tmete allkirju"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "n�ita v�tmeid ja s�rmej�lgi"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "n�ita salajasi v�tmeid"
 
@@ -1893,7 +1898,7 @@ msgstr "n
 msgid "generate a new key pair"
 msgstr "genereeri uus v�tmepaar"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "eemalda v�tmed avalike v�tmete hoidlast"
 
@@ -1921,11 +1926,11 @@ msgstr "genereeri t
 msgid "export keys"
 msgstr "ekspordi v�tmed"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "ekspordi v�tmed v�tmeserverisse"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "impordi v�tmed v�tmeserverist"
 
@@ -1962,20 +1967,20 @@ msgstr "uuenda usalduse andmebaasi"
 msgid "print message digests"
 msgstr "|algo [failid]|tr�ki teatel�hendid"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|kr�pti NIMEle"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "kasuta seda kasutaja IDd"
@@ -1989,12 +1994,12 @@ msgstr "|N|m
 msgid "use canonical text mode"
 msgstr "kasuta kanoonilist tekstimoodi"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "�ra tee mingeid muutusi"
 
@@ -2006,7 +2011,7 @@ msgstr "k
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2014,7 +2019,7 @@ msgstr ""
 "@\n"
 "(K�ikide k�skude ja v�tmete t�ieliku kirjelduse leiate manualist)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2052,7 +2057,7 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2080,7 +2085,7 @@ msgstr "Pakkimine: "
 msgid "usage: gpg [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "vastuolulised k�sud\n"
 
@@ -2156,461 +2161,461 @@ msgstr "Hoiatus: ebaturvalised kataloogi 
 msgid "unknown configuration item `%s'\n"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "n�ita millisesse v�tmehoidlasse n�idatud v�ti kuulub"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2624,7 +2629,7 @@ msgstr "v
 msgid "make timestamp conflicts only a warning"
 msgstr "teata ajatemplite konfliktist ainult hoiatusega"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FP|kirjuta olekuinfo sellesse failipidemesse"
 
@@ -3430,20 +3435,20 @@ msgstr "allkirjastamine eba
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Primaarse v�tme salajased komponendid ei ole k�ttesaadavad.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
@@ -3460,7 +3465,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
@@ -4259,12 +4264,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjutan v�tit siduva allkirja\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "vigane v�tme suurus; kasutan %u bitti\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@ -4335,76 +4340,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA ja ElGamal (vaikimisi)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (ainult allkirjastamiseks)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (ainult kr�ptimiseks)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (ainult kr�pteerimiseks)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Millist v�tmepikkust te soovite? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4420,7 +4430,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4436,40 +4446,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4477,12 +4487,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4493,7 +4503,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4509,44 +4519,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4557,7 +4567,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4572,23 +4582,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4596,12 +4606,19 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Palun sisestage parool; see on salajane tekst \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4613,7 +4630,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4625,50 +4642,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4678,43 +4695,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -5244,66 +5261,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "s�numil�hendi algoritmi %s (%d) kasutamine on vastuolus saaja eelistustega\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA �ifri lisandprogrammi pole\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = esita palun t�iendavat infot\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ebasoovitav v�ti \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "HOIATUS: v�tit \"%s\" ei soovitata kasutada.\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "palun kasutage selle asemel \"%s%s\"\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Pakkimata"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Pakkimata"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
@@ -5346,28 +5363,28 @@ msgstr "uus omaduste fail `%s' on loodud\n"
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5380,25 +5397,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bitti %s v�ti, ID %08lX, loodud %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Sisestage parool\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "katkestatud kasutaja poolt\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "ei t��deldud"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5408,12 +5420,12 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitine %s v�ti, ID %08lX, loodud %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6573,6 +6585,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei t��deldud"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6665,19 +6682,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6726,7 +6743,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -6746,15 +6763,15 @@ msgstr "v
 msgid "reading public key failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6773,150 +6790,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -6932,63 +6948,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|kasuta NIME vaikimisi saajana"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "�ra kasuta terminali"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "vastuolulised k�sud\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7096,7 +7112,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
@@ -7560,147 +7576,147 @@ msgstr "eelistus %c%lu on duplikaat\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "n�ita salajasi v�tmeid"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "halb sertifikaat"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuda parooli"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "loo ascii pakendis v�ljund"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "�ra kasuta terminali"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "pakettmood: �ra k�si kunagi"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "eelda enamus k�simustele jah vastust"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "eelda enamus k�simustele ei vastust"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisa see v�tmehoidla v�tmehoidlate nimekirja"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|kasuta NIME vaikimisi salajase v�tmena"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|kasuta seda v�tmeserverit"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|kasuta �ifri algoritmi NIMI"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|kasuta teatel�hendi algoritmi NIMI"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7711,60 +7727,56 @@ msgstr ""
 "allkirjasta, kontrolli, kr�pti ja dekr�pti\n"
 "vaikimisi operatsioon s�ltub sisendandmetest\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tundmatu vaikimisi saaja `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kirjeldust ei antud)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " j = j�ta see v�ti vahele\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7940,7 +7952,7 @@ msgstr ""
 "\n"
 "See saab olema iseenda allkiri.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "v�lju"
@@ -8175,78 +8187,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tundmatu seade \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "kasuta v�ljundfailina"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "kasuta: gpg [v�tmed] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "ei leia avalikku v�tit"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
@@ -8432,13 +8444,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA v�tmepaari pikkuseks saab 1024 bitti.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Korrake parooli\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "tundmatu"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "loen v�tmeid failist `%s'\n"
diff --git a/po/fi.po b/po/fi.po
index f5786100d..38351f4d0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -35,70 +35,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -108,79 +108,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: hajautustaulukon luonti ei onnistu: %s\n"
@@ -318,7 +318,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -329,263 +329,263 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -602,8 +602,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -611,8 +611,8 @@ msgstr ""
 "@Komennot:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -623,91 +623,91 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lukuvirhe: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -719,19 +719,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -743,7 +743,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -753,11 +753,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -823,40 +823,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[Käyttäjätunnusta ei löytynyt]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent ei ole käytettävissä tässä istunnossa\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "yhteys kohteeseen \"%s\" ei onnistu: %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agentin kanssa yhteysongelma\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
@@ -1093,6 +1093,11 @@ msgstr "Ei ohjetta aiheesta \"%s\""
 msgid "ignoring garbage line"
 msgstr "virhe trailer-rivissä\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "tuntematon "
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1205,7 +1210,7 @@ msgstr "VAROITUS: löydettiin väärin muotoiltua notaatiodataa\n"
 msgid "not human readable"
 msgstr "ei ihmisten luettavissa"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "salaista avainta ei löydy"
@@ -1215,8 +1220,8 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1226,170 +1231,170 @@ msgstr "tätä ei voi tehdä eräajossa\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Valintasi? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Ei eriteltyä syytä"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "ei käsitelty"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "ei vastaavaa julkista avainta: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "päivitä valinnat"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Valinnassa on luvaton merkki\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "virhe: sormenjälki on väärä\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1397,140 +1402,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Allekirjoitus vanheni %s\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Valinta ei kelpaa.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "tuntematon suojausalgoritmi\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Avain saatavilla kohteessa: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "muuta voimassoloaikaa"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muuta luottamusastetta"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "luo uusi avainpari"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Komento> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -1538,7 +1543,7 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
@@ -1857,37 +1862,37 @@ msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[tiedosto]|tee selkokielinen allekirjoitus"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "tee erillinen allekirjoitus"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "salaa tiedot"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "salaa vain symmetrisellä salaimella"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "avaa tiedot (oletus)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "tarkista allekirjoitus"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "näytä avaimet"
 
@@ -1900,11 +1905,11 @@ msgstr "näytä avaimet allekirjoituksineen"
 msgid "list and check key signatures"
 msgstr "tarkista avainten allekirjoitukset"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "näytä avaimet sormenjälkineen"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "näytä salaiset avaimet"
 
@@ -1912,7 +1917,7 @@ msgstr "näytä salaiset avaimet"
 msgid "generate a new key pair"
 msgstr "luo uusi avainpari"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "poista avaimet julkisten avainten renkaasta"
 
@@ -1940,11 +1945,11 @@ msgstr "luo mitätöintivarmenne"
 msgid "export keys"
 msgstr "vie avaimia"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "vie avaimia palvelimelle"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "nouda avaimia avainpalvelimelta"
 
@@ -1981,20 +1986,20 @@ msgstr "päivitä luottamustietokanta"
 msgid "print message digests"
 msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NIMI|salaa vastaanottajalle NIMI"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "käytä tätä käyttäjätunnusta allekirjoittamiseen ja avaamiseen"
@@ -2008,12 +2013,12 @@ msgstr "|N|aseta pakkausaste N (0 poistaa käytöstä)"
 msgid "use canonical text mode"
 msgstr "käytä tekstimuotoa"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "älä tee muutoksia"
 
@@ -2025,7 +2030,7 @@ msgstr "kysy ennen ylikirjoittamista"
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2034,7 +2039,7 @@ msgstr ""
 "(Katso täydellinen luettelo kaikista komennoista ja valitsimista man-"
 "sivuilta)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2072,7 +2077,7 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2100,7 +2105,7 @@ msgstr "Pakkaus: "
 msgid "usage: gpg [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "ristiriitainen komento\n"
 
@@ -2176,462 +2181,462 @@ msgstr "VAROITUS: Hakemiston %s \"%s\" oikeudet eivät ole turvallisia\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "näytä mihin avainrenkaaseen tulostettu avain kuuluu"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2645,7 +2650,7 @@ msgstr "ota avaimet tästä avainrenkaasta"
 msgid "make timestamp conflicts only a warning"
 msgstr "käsittele aikaleimakonfliktit pelkkinä varoituksina"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tilatiedot kirjoitetaan FD:iin"
 
@@ -3457,20 +3462,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Ensisijaisen avaimen salaiset osat eivät ole saatavilla.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3487,7 +3492,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -4291,12 +4296,12 @@ msgid "writing key binding signature\n"
 msgstr "kirjoitetaan avaimen varmentava allekirjoitus\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "avaimen koko on virheellinen, käytetään %u bittiä\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4367,76 +4372,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Valitse millaisen avaimen haluat:\n"
 
-#: g10/keygen.c:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA ja ElGamal (oletus)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA ja ElGamal (oletus)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (vain salaus)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (vain salaus)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (vain allekirjoitus)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (vain salaus)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (vain salaus)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (vain salaus)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-avainparissa on 1024 bittiä.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Minkä kokoisen avaimen haluat? (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Minkä kokoisen avaimen haluat? (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4452,7 +4462,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4468,40 +4478,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4509,12 +4519,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4525,7 +4535,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4543,44 +4553,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 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:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4591,7 +4601,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4606,23 +4616,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4630,12 +4640,19 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Ole hyvä ja syötä salasana, tämän on salainen lause \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4647,7 +4664,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4659,50 +4676,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4711,12 +4728,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4724,7 +4741,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4732,26 +4749,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -5290,66 +5307,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "valittua tiivistesalgoritmia %s (%d) ei löydy vastaanottajan valinnoista\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA-salaimen liitännäinen ei käytettävissä\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = näytä lisätietoja\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: paheksuttava valitsin \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROITUS: \"%s\" on paheksuttu valitsin\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "käytä valitsinta \"%s%s\" sen sijaan\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "pakkaamaton"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "pakkaamaton"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
@@ -5394,26 +5411,26 @@ msgstr ""
 "VAROITUS: asetukset tiedostossa \"%s\" eivät ole käytössä vielä tässä "
 "ajossa\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5426,25 +5443,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bittinen %s-avain, tunnus %08lX, luotu %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Syötä salasana\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "käyttäjän peruma\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "ei käsitelty"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5453,12 +5465,12 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6637,6 +6649,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei käsitelty"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6730,19 +6747,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6791,7 +6808,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -6811,15 +6828,15 @@ msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6838,151 +6855,150 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -6998,63 +7014,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NIMI|käytä NIMI oletusvastaanottajana"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "älä käytä lainkaan päätettä"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "ristiriitainen komento\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7162,7 +7178,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
@@ -7626,147 +7642,147 @@ msgstr "valinta %c%lu on kopio\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "näytä salaiset avaimet"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "virheellinen varmenne"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muuta salasanaa"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "tuota ascii-koodattu tuloste"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "älä käytä lainkaan päätettä"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "eräajo: älä kysy mitään"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "oleta myönteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "oleta kielteinen vastaust useimpiin kysymyksiin"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lisää tämä avainrengas avainrenkaiden luetteloon"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NIMI|käytä oletusarvoisesti salaista avainta NIMI"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|PALVELIN|käytä tätä palvelinta avainten etsimiseen"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NIMI|käytä salausalgoritmia NIMI"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NIMI|käytä viestintiivistealgoritmia NIMI"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7777,60 +7793,56 @@ msgstr ""
 "allekirjoita, tarkista, salaa tai avaa\n"
 "oletustoiminto riippuu syötteestä\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "tuntematon oletusvastaanottaja \"%s\"\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Kuvausta ei annettu)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = ohita tämä avain\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8006,7 +8018,7 @@ msgstr ""
 "\n"
 "Tämä tulee olemaan oma-allekirjoitus.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "lopeta|sulje"
@@ -8241,78 +8253,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "tuntematon asetus \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "käytä tulostustiedostona"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "käyttö: gpg [valitsimet] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "julkista avainta ei löydy"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -8498,13 +8510,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-avainparissa on 1024 bittiä.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Toista salasana\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "tuntematon "
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "luetaan asetukset tiedostosta \"%s\"\n"
diff --git a/po/fr.po b/po/fr.po
index 57deadbfe..9d9ee1a18 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-09-30 19:38+0200\n"
 "Last-Translator: Ga�l Qu�ri <gael@lautre.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -24,71 +24,71 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -98,82 +98,82 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr ""
 "aucun portes-cl�s secret n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: la cr�ation de la table de hachage a �chou�: %s\n"
@@ -314,7 +314,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -325,268 +325,268 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Signaler toutes anomalies � <gnupg-bugs@gnu.org> (en anglais)\n"
 "et tout probl�me de traduction � <traduc@traduc.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr ""
 "erreur pendant la recherche de l'enregistrement de confiance\n"
 "dans `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 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:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -603,8 +603,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -612,8 +612,8 @@ msgstr ""
 "@Commandes:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -624,91 +624,91 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erreur dans `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erreur de lecture dans `%s': %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -720,19 +720,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -744,7 +744,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -754,11 +754,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -826,39 +826,39 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erreur pendant la cr�ation de `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[Nom utilisateur introuvable]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent n'est pas disponible dans cette session\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossible de se connecter � `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
@@ -1099,6 +1099,11 @@ msgstr "Pas d'aide disponible pour `%s'"
 msgid "ignoring garbage line"
 msgstr "erreur dans la ligne de remorque\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[non positionn�]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1207,7 +1212,7 @@ msgstr "ATTENTION: des donn
 msgid "not human readable"
 msgstr "illisible par un humain"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la carte OpenPGP n'est pas disponible: %s\n"
@@ -1217,8 +1222,8 @@ msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1227,162 +1232,162 @@ msgstr "impossible de faire cela en mode automatique\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Votre choix ? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[non positionn�]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "f�minin"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "non sp�cifi�"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "non forc�"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "forc�"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Erreur: Seul l'ASCII standard est permis pour l'instant.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Erreur: Le caract�re � < � ne peut pas �tre utilis�.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Erreur: Les espaces doubles ne sont pas permis.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Nom du d�teneur de la carte: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Pr�nom du d�teneur de la carte: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Erreur: Nom combin� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL pour r�cup�rer la cl� publique: %s"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Erreur: URL trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erreur durant la cr�ation du porte-cl�s `%s' : %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Donn�es d'identification (nom du compte): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 "Erreur: Donn�es d'indentification trop longues (la limite est\n"
 "%d caract�res).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Donn�es DO priv�es: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Erreur: DO priv� trop long (la limite est %d caract�res).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Pr�f�rences de langue: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Erreur: longueur invalide de la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Erreur: caract�res invalide dans la cha�ne de pr�f�rences.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sexe ((M)asculin, (F)�minin ou espace): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Erreur: r�ponse invalide.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "empreinte de l'autorit� de certification: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Erreur: empreinte mal format�e.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "l'op�ration sur la cl� n'est pas possible: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "ce n'est pas une carte OpenPGP"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Remplacer la cl� existante ? (o/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Faire une sauvegarde hors carte de la cl� de chiffrement ? (O/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Remplacer les cl�s existantes ? (o/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1393,126 +1398,126 @@ msgstr ""
 "   PIN = `%s'     PIN admin = `%s'\n"
 "Vous devriez les changer avec la commande --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "S�lectionnez le type de cl� � g�n�rer:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cl� de signature\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cl� de chiffrement\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cl� d'authentification\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Choix invalide.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "S�lectionnez l'endroit o� stocker la cl�:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "algorithme de protection de cl� inconnu\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "Les parties secr�tes de la cl� ne sont pas disponibles.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "afficher cette aide"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "lister toutes les donn�es disponibles"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "changer le nom du propri�taire de la carte"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "changer l'URL pour r�cup�rer la cl�"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "aller chercher la cl� sp�cifi�e dans l'URL de la carte"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "changer le nom d'identification"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "changer les pr�f�rences de langue"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "changer le sexe du propri�taire de la carte"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "changer l'empreinte d'une autorit� de certification"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 "inverser le param�tre obligeant � rentrer le code PIN pour les\n"
 "signatures"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "g�n�rer de nouvelles cl�s"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "menu pour changer ou d�verrouiller le PIN"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "v�rifier le code PIN et lister toutes les donn�es"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Commande> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "La commande n'est utilisable qu'en mode administration\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Les commandes d'administration sont permises\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -1520,7 +1525,7 @@ msgstr "Commande invalide  (essayez 
 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:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
@@ -1846,37 +1851,37 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fichier]|faire une signature"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fichier]|faire une signature en texte clair"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "faire une signature d�tach�e"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "chiffrer les donn�es"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "chiffrement sym�trique seulement"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "d�chiffrer les donn�es (d�faut)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "v�rifier une signature"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "lister les cl�s"
 
@@ -1888,11 +1893,11 @@ msgstr "lister les cl
 msgid "list and check key signatures"
 msgstr "lister et v�rifier les signatures des cl�s"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "lister les cl�s et les empreintes"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "lister les cl�s secr�tes"
 
@@ -1900,7 +1905,7 @@ msgstr "lister les cl
 msgid "generate a new key pair"
 msgstr "g�n�rer une nouvelle paire de cl�s"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "enlever les cl�s du porte-cl�s public"
 
@@ -1928,11 +1933,11 @@ msgstr "g
 msgid "export keys"
 msgstr "exporter les cl�s"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exporter les cl�s vers un serveur de cl�s"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importer les cl�s d'un serveur de cl�s"
 
@@ -1969,20 +1974,20 @@ msgstr "mettre la base de confiance 
 msgid "print message digests"
 msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOM|chiffrer pour NOM"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "utiliser ce nom pour signer ou d�chiffrer"
@@ -1996,12 +2001,12 @@ msgstr "|N|niveau de compression N (0 d
 msgid "use canonical text mode"
 msgstr "utiliser le mode texte canonique"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ne rien changer"
 
@@ -2013,7 +2018,7 @@ msgstr "demander avant d'
 msgid "use strict OpenPGP behavior"
 msgstr "utiliser strictement le comportement OpenPGP"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2021,7 +2026,7 @@ msgstr ""
 "@\n"
 "(Voir la page de manuel pour une liste compl�te des commandes et options)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2061,7 +2066,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:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2089,7 +2094,7 @@ msgstr "Compression: "
 msgid "usage: gpg [options] "
 msgstr "utilisation: gpg [options] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "commandes en conflit\n"
 
@@ -2189,470 +2194,470 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, 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:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, 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:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, 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:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, 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:2674
+#: g10/gpg.c:2678
 #, 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:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, 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:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, 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:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, 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:3689
+#: g10/gpg.c:3687
 #, 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:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 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"
 
@@ -2667,7 +2672,7 @@ msgstr ""
 "faire en sorte que les conflits d'horodatage ne soient qu'un\n"
 "avertissement non fatal"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|�crire l'�tat sur ce descripteur"
 
@@ -3465,21 +3470,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr ""
 "Les parties secr�tes de la cl� principale sont stock�es sur la\n"
 "carte.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
@@ -3494,7 +3499,7 @@ msgid ""
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
@@ -4289,12 +4294,12 @@ msgid "writing key binding signature\n"
 msgstr "�criture de la signature de liaison\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Taille invalide; utilisation de %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
@@ -4363,76 +4368,81 @@ msgstr "   (%c) Inverser la capacit
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Termin�\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA et Elgamal (par d�faut)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (signature seule)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (chiffrement seul)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (signature seule)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (chiffrement seul)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (chiffrement seul)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (indiquez vous-m�me les capacit�s)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (indiquez vous-m�me les capacit�s)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "La paire de cl�s DSA fera %u bits.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Quelle taille de cl� d�sirez-vous ? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4448,7 +4458,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4464,38 +4474,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4503,11 +4513,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4518,7 +4528,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4534,44 +4544,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> �\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 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:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4582,7 +4592,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
@@ -4598,23 +4608,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4623,12 +4633,19 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Entrez le mot de passe ; c'est une phrase secr�te \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4642,7 +4659,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4654,52 +4671,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, 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:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, 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:3525
+#: g10/keygen.c:3574
 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:3536
+#: g10/keygen.c:3585
 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"
@@ -4708,13 +4725,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, 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:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4722,7 +4739,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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4730,26 +4747,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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, 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:4012
+#: g10/keygen.c:4078
 #, 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:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -5295,67 +5312,67 @@ msgstr ""
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISSEMENT: l'algorithme de hachage %s est d�conseill�\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "le module de chiffrement IDEA n'est pas pr�sent\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, 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:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: option d�conseill�e \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISSEMENT: \"%s\" est une option d�conseill�e.\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "utilisez \"%s%s\" � la place\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Non-compress�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "noncompress�|non"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "option ambigu� `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "option `%s' inconnue\n"
@@ -5398,28 +5415,28 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISSEMENT: les options de `%s' ne sont pas encore actives cette fois\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5433,25 +5450,20 @@ msgstr ""
 "\"%.*s\"\n"
 "cl� %u bits %s, ID %s, cr��e %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Entrez la phrase de passe\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "annul� par l'utilisateur\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "non forc�"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5460,12 +5472,12 @@ msgstr ""
 "Vous avez besoin d'une phrase de passe pour d�verrouiller la\n"
 "cl� secr�te pour l'utilisateur: � %s �\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cl� de %u bits %s, ID %s, cr��e le %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
@@ -6658,6 +6670,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "non forc�"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6752,19 +6769,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
@@ -6813,7 +6830,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
@@ -6833,15 +6850,15 @@ msgstr "impossible de stocker la date de cr
 msgid "reading public key failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "la r�ponse ne contient pas les donn�es de cl� publique\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "la r�ponse ne contient pas le modulo RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
@@ -6860,155 +6877,154 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
 
-#: scd/app-openpgp.c:1598
-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:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 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:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "%d tentatives de PIN admin restent jusqu'� ce que la carte\n"
 "soit irr�m�diablement bloqu�e\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+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:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 "Le code PIN pour CHV%d est trop court ; la longueur minimale\n"
 "est %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 "le nombre premier RSA %s est manquant ou bien sa taille n'est pas\n"
 "%d bits\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "la g�n�ration de cl� a �t� effectu�e (%d secondes)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -7025,60 +7041,60 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "indiquer les commandes d'administration"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7185,7 +7201,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "la lecture de la cl� publique a �chou�: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7654,148 +7670,148 @@ msgstr "pr
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "la suppression du bloc de cl�s a �chou� : %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "lister les cl�s secr�tes"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "mauvais certificat"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 #, fuzzy
 msgid "register a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "changer la phrase de passe"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "cr�er une sortie ascii avec armure"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "lire les options de `%s'\n"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "enlever les cl�s de ce porte-cl�s"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "algorithme de chiffrement inconnu"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7806,60 +7822,56 @@ 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:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "utilisation: gpg [options] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "option `%s' inconnue\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Aucune description donn�e)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = sauter cette cl�\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8039,7 +8051,7 @@ msgstr "                alias 
 msgid "This is a qualified signature\n"
 msgstr "Ceci sera une auto-signature.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quitter"
@@ -8275,78 +8287,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "�l�ment de configuration `%s' inconnu\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "utiliser comme fichier de sortie"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "utilisation: gpg [options] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "cl� publique non trouv�e"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Les commandes d'administration ne sont pas permises\n"
@@ -8532,6 +8544,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "La paire de cl�s DSA fera %u bits.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "R�p�tez la phrase de passe\n"
 
@@ -8542,10 +8557,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|code PIN d'administration"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[non positionn�]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "lire les options de `%s'\n"
diff --git a/po/gl.po b/po/gl.po
index f8d31e04d..9c2a573cb 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <jtarrio@trasno.net>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -19,70 +19,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -92,79 +92,79 @@ msgstr "contrasinal err
 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "non se atopou un chaveiro privado no que se poida escribir: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: fallo ao crear unha t�boa hash: %s\n"
@@ -303,7 +303,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -314,266 +314,266 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Por favor, informe dos erros no programa a <gnupg-bugs@gnu.org>,\n"
 "e dos erros na traducci�n a <proxecto@trasno.net>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de datos de confianza: fallou a lectura (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: non foi posible crear un directorio: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -590,8 +590,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -599,8 +599,8 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -611,91 +611,91 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de lectura: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -707,19 +707,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -731,7 +731,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -741,11 +741,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -811,40 +811,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usuario non atopado\n"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non est� dispo�ible nesta sesi�n\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "non se puido conectar a `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "problema de comunicaci�n con gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
@@ -1085,6 +1085,11 @@ msgstr "Non hai axuda dispo
 msgid "ignoring garbage line"
 msgstr "error nunha li�a adicional\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "desco�ecido"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1196,7 +1201,7 @@ msgstr "AVISO: atop
 msgid "not human readable"
 msgstr "non lexible por humanos"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "a chave secreta non est� dispo�ible"
@@ -1206,8 +1211,8 @@ msgstr "a chave secreta non est
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1217,170 +1222,170 @@ msgstr "non se pode facer iso no modo por lotes\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�A s�a selecci�n? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Non se especificou un motivo"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "non procesado"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non hai unha chave p�blica correspondente: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferencias actualizadas"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter non v�lido na cadea de preferencias\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Pegada dactilar:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: pegada dactilar non v�lida\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1388,140 +1393,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor, seleccione o tipo de chave que quere:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "A sinatura caducou o %s\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selecci�n non v�lida.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de protecci�n desco�ecido\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "amosar esta axuda"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Chave dispo�ible en: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia-la fecha de expiraci�n"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "xerar un novo par de chaves"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -1529,7 +1534,7 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
@@ -1850,37 +1855,37 @@ msgstr "empr
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|facer unha sinatura en texto claro"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "facer unha sinatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "cifrar datos"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar s� con cifrado sim�trico"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "descifrar datos (por defecto)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verificar unha sinatura"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "ve-la lista de chaves"
 
@@ -1893,11 +1898,11 @@ msgstr "ve-la lista de chaves e sinaturas"
 msgid "list and check key signatures"
 msgstr "verifica-las sinaturas das chaves"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "ve-la lista de chaves e pegadas dactilares"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "ve-la lista de chaves secretas"
 
@@ -1905,7 +1910,7 @@ msgstr "ve-la lista de chaves secretas"
 msgid "generate a new key pair"
 msgstr "xerar un novo par de chaves"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "borrar chaves do chaveiro p�blico"
 
@@ -1933,11 +1938,11 @@ msgstr "xerar un certificado de revocaci
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exportar chaves a un servidor de chaves"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importar chaves dun servidor de chaves"
 
@@ -1974,20 +1979,20 @@ msgstr "actualiza-la base de datos de confianza"
 msgid "print message digests"
 msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "empregar este id de usuario para asinar ou descifrar"
@@ -2001,12 +2006,12 @@ msgstr "|N|axusta-lo nivel de compresi
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "non facer ning�n cambio"
 
@@ -2018,7 +2023,7 @@ msgstr "avisar antes de sobrescribir"
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2026,7 +2031,7 @@ msgstr ""
 "@\n"
 "(Vexa a p�xina man para un listado completo de comandos e opci�ns)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2066,7 +2071,7 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2094,7 +2099,7 @@ msgstr "Compresi
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "comandos conflictivos\n"
 
@@ -2170,464 +2175,464 @@ msgstr "AVISO: permisos do directorio contedor inseguros en %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "amosar en que chaveiro est� unha chave listada"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, 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:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, 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:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, 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:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, 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:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 #, 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:3161
+#: g10/gpg.c:3156
 #, 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, 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:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 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:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2641,7 +2646,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:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|DF|escribi-la informaci�n de estado a este DF"
 
@@ -3456,20 +3461,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "as partes secretas da chave primaria non est�n dispo�ibles.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
@@ -3486,7 +3491,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
@@ -4304,12 +4309,12 @@ msgid "writing key binding signature\n"
 msgstr "escribindo unha sinatura que liga a chave\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tama�o de chave non v�lido; empregando %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
@@ -4380,76 +4385,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (por defecto)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (por defecto)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (s� asinar)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (s� cifrar)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (s� cifrar)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (s� asinar)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (s� cifrar)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (s� cifrar)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (s� cifrar)\n"
 
-#: g10/keygen.c:1731
-#, 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:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�Qu� tama�o de chave quere? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4465,7 +4475,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4481,40 +4491,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4522,12 +4532,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4538,7 +4548,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4555,44 +4565,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4603,7 +4613,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
@@ -4619,23 +4629,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4643,12 +4653,19 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Por favor, introduza o contrasinal; esta � unha frase secreta \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4660,7 +4677,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4672,50 +4689,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, 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:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 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:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4725,12 +4742,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4738,7 +4755,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4746,26 +4763,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -5299,66 +5316,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forza-lo algoritmo de resumo %s (%d) viola as preferencias do destinatario\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o plugin de cifra IDEA non est� presente\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = amosar m�is informaci�n\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opci�n a extinguir \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � unha opci�n a extinguir\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "empregue \"%s%s\" no seu canto\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Sen comprimir"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Sen comprimir"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
@@ -5401,27 +5418,27 @@ msgstr " creouse un novo ficheiro de configuraci
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5434,25 +5451,20 @@ msgstr ""
 "\"%.*s\"\n"
 "Chave de %u bits, %s, ID %08lX, creada o %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Introduza o contrasinal\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "cancelado polo usuario\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "non procesado"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5462,12 +5474,12 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6645,6 +6657,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "non procesado"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6739,19 +6756,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6800,7 +6817,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -6820,15 +6837,15 @@ msgstr "fallo ao reconstru
 msgid "reading public key failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6847,150 +6864,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -7007,63 +7023,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Introduza o ID de usuario: "
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|empregar NOME como valor por defecto do destinatario"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa-la terminal en absoluto"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos conflictivos\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7171,7 +7187,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7648,147 +7664,147 @@ msgstr "certificado duplicado - borrado"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "ve-la lista de chaves secretas"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correcto"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crear sa�da con armadura en ascii"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "non usa-la terminal en absoluto"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "modo por lotes: non preguntar nunca"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "asumir `si' na maior�a das preguntas"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "asumir `non' na maior�a das preguntas"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "engadir este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|empregar NOME coma chave secreta por defecto"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|empregar este servidor de chaves para buscar chaves"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de cifrado NOME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|emprega-lo algoritmo de resumos de mensaxes NOME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7799,60 +7815,56 @@ msgstr ""
 "asinar, verificar, cifrar ou descifrar\n"
 "a operaci�n por defecto depende dos datos de entrada\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario por defecto `%s' desco�ecido\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non se deu unha descrici�n)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " o = omitir esta chave\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8028,7 +8040,7 @@ msgstr ""
 "\n"
 "Esta ha ser unha auto-sinatura.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "abandonar"
@@ -8264,78 +8276,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr " creouse un novo ficheiro de configuraci�n `%s'\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "usar coma ficheiro de sa�da"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opci�ns] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "non se atopou a chave p�blica"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -8523,13 +8535,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "O par de chaves DSA ha ter 1024 bits.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Repita o contrasinal\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "desco�ecido"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "lendo as opci�ns de `%s'\n"
diff --git a/po/hu.po b/po/hu.po
index 38dddd027..7f80886e4 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <nfl@nfllab.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -19,70 +19,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -92,79 +92,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, 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 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: Hasht�bla l�trehoz�sa sikertelen: %s.\n"
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -313,262 +313,262 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "A hib�kat (angolul) a <gnupg-bugs@gnu.org> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "Hiba %s-ra/-re k�ld�skor: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "Bizalmi adatb�zis: olvas�s sikertelen (n=%d): %s.\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: Nem tudom a k�nyvt�rat l�trehozni: %s.\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 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:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -585,8 +585,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -594,8 +594,8 @@ msgstr ""
 "@Parancsok:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -606,91 +606,91 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "Olvas�si hiba: %s.\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -702,19 +702,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -726,7 +726,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -736,11 +736,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -806,40 +806,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[ismeretlen kulcs]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "GPG �gyn�k nem el�rhet� ebben a munkafolyamatban.\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "Nem tudok kapcsol�dni \"%s\" objektumhoz: %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "Kommunik�ci�s probl�ma a gpg �gyn�kkel!\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
@@ -1076,6 +1076,11 @@ msgstr "Nem 
 msgid "ignoring garbage line"
 msgstr "Hiba a z�r� sorban!\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "Ismeretlen m�d�"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1186,7 +1191,7 @@ msgstr "FIGYELEM: 
 msgid "not human readable"
 msgstr "nem olvashat� forma"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "titkos kulcs nem �ll rendelkez�sre"
@@ -1196,8 +1201,8 @@ msgstr "titkos kulcs nem 
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1207,170 +1212,170 @@ msgstr "Nem tudom ezt megcsin
 msgid "This command is only available for version 2 cards\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Mit v�laszt? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Nincs megadva ok."
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "nem feldolgozott"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "Nincs hozz� tartoz� nyilv�nos kulcs: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenci�k friss�t�se"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "�rv�nytelen karakter a preferenci�k k�z�tt!\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hiba: �rv�nytelen ujjlenyomat.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1378,140 +1383,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "K�rem, adja meg, milyen kulcsot k�v�n:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Az al��r�s lej�rt: %s.\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "�rv�nytelen v�laszt�s.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "Ismeretlen v�delmi algoritmus!\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Kulcs tal�lhat�: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "lej�rat megv�ltoztat�sa"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Parancs> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -1519,7 +1524,7 @@ msgstr "
 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:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
@@ -1835,37 +1840,37 @@ msgstr "A %08lX m
 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[f�jl]|olvashat� sz�veg al��r�sa"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "k�l�n�ll� al��r�s k�sz�t�se"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "adat titkos�t�sa"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "titkos�t�s csak szimmetrikus rejtjelez�vel"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "adat visszafejt�se (alap�rtelmez�s)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "al��r�s ellen�rz�se"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "kulcsok list�z�sa"
 
@@ -1878,11 +1883,11 @@ msgstr "kulcsok 
 msgid "list and check key signatures"
 msgstr "kulcsal��r�sok ellen�rz�se"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "kulcsok �s ujjlenyomatok list�z�sa"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "titkos kulcsok list�z�sa"
 
@@ -1890,7 +1895,7 @@ msgstr "titkos kulcsok list
 msgid "generate a new key pair"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "kulcsok elt�vol�t�sa a nyilv�noskulcs-karik�r�l"
 
@@ -1918,11 +1923,11 @@ msgstr "visszavon
 msgid "export keys"
 msgstr "kulcsok export�l�sa"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "kulcsok export�l�sa kulcsszerverre"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "kulcsok import�l�sa kulcsszerverr�l"
 
@@ -1959,20 +1964,20 @@ msgstr "bizalmi adatb
 msgid "print message digests"
 msgstr "|algo [f�jlok]|�zenet kivonat�nak ki�r�sa"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|N�V|titkos�t�s N�V r�sz�re"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "felh. azonos�t� al��r�shoz �s visszafejt�shez"
@@ -1986,12 +1991,12 @@ msgstr "|N|t
 msgid "use canonical text mode"
 msgstr "kanonikus sz�veges m�d haszn�lata"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ne csin�ljon semmi v�ltoztat�st"
 
@@ -2003,7 +2008,7 @@ msgstr "fel
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2011,7 +2016,7 @@ msgstr ""
 "@\n"
 "(A parancsok �s opci�k teljes list�j�t a man oldalon tekintheti meg.)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2049,7 +2054,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:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2077,7 +2082,7 @@ msgstr "T
 msgid "usage: gpg [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
@@ -2153,462 +2158,462 @@ msgstr "FIGYELEM: nem biztons
 msgid "unknown configuration item `%s'\n"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, 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:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mutatja a kilist�zott kulcs kulcskarik�j�t is"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, 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:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, 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:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 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:4275
+#: g10/gpg.c:4273
 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:4308
+#: g10/gpg.c:4306
 #, 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"
@@ -2622,7 +2627,7 @@ msgstr "a megadott kulcskarik
 msgid "make timestamp conflicts only a warning"
 msgstr "id�b�lyeg-konfliktus eset�n csak figyelmeztessen"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|�L|�llapotinform�ci�k �r�sa �L �llom�nyle�r�ra"
 
@@ -3430,20 +3435,20 @@ msgstr "Al
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Az els�dleges kulcs titkos r�szei nem el�rhet�k.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
@@ -3460,7 +3465,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
@@ -4263,12 +4268,12 @@ msgid "writing key binding signature\n"
 msgstr "�sszef�z� al��r�st �rok.\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "Kulcsm�ret �rv�nytelen; %u bitet haszn�lok.\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@ -4339,76 +4344,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA �s ElGamal (alap�rtelmez�s)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (csak titkos�t�s)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (csak al��r�s)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (csak titkos�t�s)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (csak titkos�t�s)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Milyen kulcsm�retet szeretne? (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Milyen kulcsm�retet szeretne? (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4424,7 +4434,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4440,40 +4450,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:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4481,12 +4491,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4497,7 +4507,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4514,44 +4524,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, 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:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4562,7 +4572,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4577,24 +4587,24 @@ msgstr "K
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4602,12 +4612,19 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "K�rem, adja meg a jelsz�t! Ezt egy titkos mondat. \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4619,7 +4636,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4631,50 +4648,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 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:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4684,46 +4701,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, 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:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -5262,66 +5279,66 @@ msgstr ""
 "%s (%d) kivonatol� algoritmus haszn�lat�nak er�ltet�se ellent�tes\n"
 "a c�mzett preferenci�ival.\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "Az IDEA rejtjelez� b�v�t�s nincs jelen!\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = tov�bbi inform�ci�kat k�rek\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: Elavult opci�: \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "K�rem, ezt haszn�lja helyette: \"%s%s\"\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "FIGYELEM: \"%s\" elavult opci�!\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "t�m�r�tetlen"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "t�m�r�tetlen"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
@@ -5365,29 +5382,29 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "FIGYELEM: \"%s\" opci�i csak a k�vetkez� fut�skor lesznek �rv�nyesek!\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
 " \n"
 "  (f� kulcsazonos�t�: %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5401,25 +5418,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u bites %s key, azonos�t�: %08lX, l�trehozva: %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "�rja be a jelsz�t!\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "A felhaszn�l� megszak�totta a m�veletet.\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "nem feldolgozott"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5430,12 +5442,12 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bites %s kulcs, azonos�t�: %08lX, l�trehozva: %s."
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6605,6 +6617,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nem feldolgozott"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6697,19 +6714,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6758,7 +6775,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -6778,15 +6795,15 @@ msgstr "Nem tudtam 
 msgid "reading public key failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6805,150 +6822,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -6964,63 +6980,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett c�mzettk�nt"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7128,7 +7144,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7593,147 +7609,147 @@ msgstr "%c%lu preferencia k
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "titkos kulcsok list�z�sa"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "rossz igazol�s"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "ne haszn�lja a termin�lt egy�ltal�n"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "k�tegelt m�d: soha nem k�rdez"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "igen v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "nem v�lasz felt�telez�se a legt�bb k�rd�sre"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "kulcskarika hozz�ad�sa a kulcskarikalist�hoz"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|N�V|N�V haszn�lata alap�rtelmezett titkos kulcsk�nt"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|G�PN�V|kulcsszerver be�ll�t�sa kulcsok keres�s�hez"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|N�V|N�V rejtjelez� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|N�V|N�V kivonatol� algoritmus haszn�lata"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, 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:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7744,60 +7760,56 @@ 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:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "Ismeretlen alap�rtelmezett c�mzett: \"%s\"\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nincs le�r�s.)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " h = kulcs kihagy�sa\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, 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:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7973,7 +7985,7 @@ msgstr ""
 "\n"
 "Ez egy �nal��r�s lesz.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "kil�p�s|kilepes"
@@ -8208,78 +8220,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "\"%s\": ismeretlen konfigur�ci�s elem.\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "kimeneti �llom�ny megad�sa"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "Haszn�lat: gpg [opci�k] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "nyilv�nos kulcs nem tal�lhat�"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@ -8465,13 +8477,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "A DSA kulcsp�r 1024 bites lesz.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Ism�telje meg a jelsz�t!\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "Ismeretlen m�d�"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
diff --git a/po/id.po b/po/id.po
index 88bf71618..ce2c03709 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <tedi_h@gmx.net>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -21,70 +21,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -94,79 +94,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: gagal membuat hashtable: %s\n"
@@ -304,7 +304,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -315,262 +315,262 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Laporkan bug ke <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,8 +587,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -596,8 +596,8 @@ msgstr ""
 "@Perintah:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -608,91 +608,91 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "kesalahan pembacaan: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -704,19 +704,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -728,7 +728,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -738,11 +738,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -808,40 +808,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[User id tidak ditemukan]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "tidak dapat terkoneksi ke `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "masalah komunikasi dengan gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
@@ -1078,6 +1078,11 @@ msgstr "Tidak tersedia bantuan untuk `%s'"
 msgid "ignoring garbage line"
 msgstr "kesalahan dalam garis trailer\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "tidak dikenal"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1189,7 +1194,7 @@ msgstr "PERINGATAN: ditemukan notasi data tidak valid\n"
 msgid "not human readable"
 msgstr "tidak dapat dibaca manusia"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "kunci rahasia tidak tersedia"
@@ -1199,8 +1204,8 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1210,170 +1215,170 @@ msgstr "tidak dapat melakukan hal itu dalam mode batch\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Pilihan anda? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Tidak ada alasan diberikan"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "tidak diproses"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "tidak ada kunci publik yang sesuai: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "perbarui preferensi"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Karakter tidak valid dalam string preferensi\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "kesalahan: fingerprint tidak valid\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1381,140 +1386,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Silakan pilih kunci yang anda inginkan:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Signature kadaluwarsa %s\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Pilihan tidak valid.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritma proteksi tidak dikenal\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Kunci tersedia di:"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "ubah tanggal kadaluarsa"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "ubah ownertrust"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "buat sepasang kunci baru"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Perintah> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -1522,7 +1527,7 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
@@ -1837,37 +1842,37 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|buat signature teks"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "buat detached signature"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "enkripsi data"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "enkripsi hanya dengan symmetric cipher"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "dekripsi data (default)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verifikasi signature"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "tampilkan kunci"
 
@@ -1880,11 +1885,11 @@ msgstr "tampilkan kunci dan signature"
 msgid "list and check key signatures"
 msgstr "periksa signature kunci"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "tampilkan kunci dan fingerprint"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "tampilkan kunci rahasia"
 
@@ -1892,7 +1897,7 @@ msgstr "tampilkan kunci rahasia"
 msgid "generate a new key pair"
 msgstr "buat sepasang kunci baru"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "hapus kunci dari keyring publik"
 
@@ -1920,11 +1925,11 @@ msgstr "buat sertifikat revokasi"
 msgid "export keys"
 msgstr "ekspor kunci"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "ekspor kunci ke key server"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "impor kunci dari key server"
 
@@ -1961,20 +1966,20 @@ msgstr "perbarui database trust"
 msgid "print message digests"
 msgstr "|algo [file]|cetak digest pesan"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMA|enkripsi untuk NAMA"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "gunakan id-user ini untuk menandai/dekripsi"
@@ -1988,12 +1993,12 @@ msgstr "|N|set tingkat kompresi N (0 tidak ada)"
 msgid "use canonical text mode"
 msgstr "gunakan mode teks kanonikal"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "jangan buat perubahan"
 
@@ -2005,7 +2010,7 @@ msgstr "tanya sebelum menimpa"
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2013,7 +2018,7 @@ msgstr ""
 "@\n"
 "(Lihat man page untuk daftar lengkap semua perintah dan option)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2051,7 +2056,7 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2079,7 +2084,7 @@ msgstr "Kompresi: "
 msgid "usage: gpg [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "perintah saling konflik\n"
 
@@ -2155,470 +2160,470 @@ msgstr "Peringatan: permisi direktori tidak aman pada %s \"%s\"\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "tampilkan keyring tempat kunci yang dipilih berada"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2632,7 +2637,7 @@ msgstr "mengambil kunci ini dari keyring"
 msgid "make timestamp conflicts only a warning"
 msgstr "buat timestamp konflik hanya sebagai peringatan"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|tulis info status ke FD ini"
 
@@ -3441,20 +3446,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Bagian rahasia kunci primer tidak tersedia.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
@@ -3471,7 +3476,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
@@ -4277,12 +4282,12 @@ msgid "writing key binding signature\n"
 msgstr "menulis key binding signature\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "keysize tidak valid; menggunakan %u bit\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4353,76 +4358,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "  (%d) DSA dan ElGamal (baku)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "  (%d) DSA dan ElGamal (baku)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "  (%d) DSA (hanya menandai)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "  (%d) RSA (hanya enkripsi)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "  (%d) ElGamal (hanya enkripsi)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "  (%d) RSA (hanya menandai)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "  (%d) ElGamal (hanya enkripsi)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "  (%d) RSA (hanya enkripsi)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "  (%d) RSA (hanya enkripsi)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Keypair DSA akan memiliki 1024 bit.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Keysize yang anda inginkan? (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Keysize yang anda inginkan? (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4438,7 +4448,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4454,40 +4464,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4495,12 +4505,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4511,7 +4521,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4527,44 +4537,44 @@ msgstr ""
 "user-id dari Nama sebenarnya, Komentar dan Alamat email dalam bentuk:\n"
 "  \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4574,7 +4584,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4589,23 +4599,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4613,12 +4623,19 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4631,7 +4648,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4643,50 +4660,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4696,45 +4713,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -5263,66 +5280,66 @@ msgstr "%s signature, algoritma digest %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "memaksa algoritma digest %s (%d) melanggar preferensi penerima\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin cipher IDEA tidak tersedia\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = beri saya informasi lebih banyak lagi\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: opsi tidak digunakan lagi \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "WARNING: \"%s\" adalah opsi terdepresiasi\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "silakan gunakan \"%s%s\"\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Tidak dikompresi"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Tidak dikompresi"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
@@ -5365,26 +5382,26 @@ msgstr "file konfigurasi baru `%s' tercipta\n"
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5397,25 +5414,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, tercipta %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Masukkan passphrase\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "dibatalkan oleh user\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "tidak diproses"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5425,12 +5437,12 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6599,6 +6611,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "tidak diproses"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6691,19 +6708,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6752,7 +6769,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -6772,15 +6789,15 @@ msgstr "gagal membuat kembali cache keyring: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6799,150 +6816,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -6958,63 +6974,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMA|gunakan NAMA sebagai penerima baku"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "jangan menggunakan terminal"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "perintah saling konflik\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7122,7 +7138,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
@@ -7587,147 +7603,147 @@ msgstr "preferensi %c%lu ganda \n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "tampilkan kunci rahasia"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "sertifikat yang buruk"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "ubah passphrase"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ciptakan output ascii"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "jangan menggunakan terminal"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "mode batch: tanpa tanya"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "asumsikan ya untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "asumsikan tidak untuk seluruh pertanyaan"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "tambah keyring ini ke daftar keyring"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAMA|gunakan NAMA sebagai kunci rahasia baku"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|gunakan keyserver ini utk lihat kunci"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMA|gunakan algoritma cipher NAMA"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMA|gunakan algoritma digest pesan NAMA"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7738,60 +7754,56 @@ msgstr ""
 "tandai, cek, enkripsi atau dekripsi\n"
 "operasi baku tergantung pada data input\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "penerima baku tidak dikenal `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Tidak diberikan deskripsi)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = lewati kunci ini\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7967,7 +7979,7 @@ msgstr ""
 "\n"
 "Ini akan jadi self-signature.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "q|k|keluar"
@@ -8202,78 +8214,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "Item Konfigurasi tidak dikenal \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "gunakan sebagai file output"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pemakaian: gpg [pilihan] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "kunci publik tidak ditemukan"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -8459,13 +8471,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Keypair DSA akan memiliki 1024 bit.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Ulangi passphrase\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "tidak dikenal"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "membaca pilihan dari `%s'\n"
diff --git a/po/it.po b/po/it.po
index 967072a57..54b30a148 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <md@linux.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,70 +19,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -92,79 +92,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: creazione della tabella hash fallita: %s\n"
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -313,262 +313,262 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Per favore segnala i bug a <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -585,8 +585,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -594,8 +594,8 @@ msgstr ""
 "@Comandi:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -606,91 +606,91 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Inserisci la passphrase, cio� una frase segreta \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "errore di lettura: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -702,19 +702,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -726,7 +726,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -736,11 +736,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -806,40 +806,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[User ID non trovato]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "impossibile connettersi a `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "problema di comunicazione con gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
@@ -1076,6 +1076,11 @@ msgstr "Non 
 msgid "ignoring garbage line"
 msgstr "errore nella riga della coda\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "sconosciuto"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1187,7 +1192,7 @@ msgstr "ATTENZIONE: trovati dati di una nota non validi\n"
 msgid "not human readable"
 msgstr "non leggibile"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "la chiave segreta non � disponibile"
@@ -1197,8 +1202,8 @@ msgstr "la chiave segreta non 
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1208,171 +1213,171 @@ msgstr "impossibile fare questo in modo batch\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Cosa scegli? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "abilita"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "abilita"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Nessuna ragione specificata"
 
 # ??? (Md)
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "non esaminato"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "non c'� una chiave pubblica corrispondente: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "preferenze aggiornate"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "carattere non valido nella stringa delle preferenze\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "errore: impronta digitale non valida\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1380,140 +1385,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Per favore scegli che tipo di chiave vuoi:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Firma scaduta il %s\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Scelta non valida.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo di protezione sconosciuto\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Chiave disponibile presso: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "cambia la data di scadenza"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "cambia il valore di fiducia"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -1521,7 +1526,7 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
@@ -1846,37 +1851,37 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[file]|fai una firma mantenendo il testo in chiaro"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "fai una firma separata"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "cifra dati"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "cifra solo con un cifrario simmetrico"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "decifra dati (predefinito)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verifica una firma"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "elenca le chiavi"
 
@@ -1889,11 +1894,11 @@ msgstr "elenca le chiavi e le firme"
 msgid "list and check key signatures"
 msgstr "controlla le firme delle chiavi"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "elenca le chiavi e le impronte digitali"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "elenca le chiavi segrete"
 
@@ -1901,7 +1906,7 @@ msgstr "elenca le chiavi segrete"
 msgid "generate a new key pair"
 msgstr "genera una nuova coppia di chiavi"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "rimuove le chiavi dal portachiavi pubblico"
 
@@ -1929,11 +1934,11 @@ msgstr "genera un certificato di revoca"
 msgid "export keys"
 msgstr "esporta delle chiavi"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "esporta le chiavi a un key server"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importa le chiavi da un key server"
 
@@ -1970,20 +1975,20 @@ msgstr "aggiorna il database della fiducia"
 msgid "print message digests"
 msgstr "|algo [files]|stampa tutti i message digests"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifra per NOME"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "usa questo user-id per firmare o decifrare"
@@ -1997,12 +2002,12 @@ msgstr "|N|imposta il livello di compressione (0 disab.)"
 msgid "use canonical text mode"
 msgstr "usa il modo testo canonico"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "non fa cambiamenti"
 
@@ -2014,7 +2019,7 @@ msgstr "chiede prima di sovrascrivere"
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2022,7 +2027,7 @@ msgstr ""
 "@\n"
 "(Vedi la man page per una lista completa di tutti i comandi e opzioni)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2060,7 +2065,7 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2088,7 +2093,7 @@ msgstr "Compressione: "
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "comandi in conflitto\n"
 
@@ -2164,465 +2169,465 @@ msgstr "ATTENZIONE: i permessi \"%s\" di %s sono insicuri\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostra in quali portachiavi sono contenute le chiavi elencate"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2636,7 +2641,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:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrivi le informazioni di stato sul FD"
 
@@ -3446,20 +3451,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Parti della chiave segreta non sono disponibili.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
@@ -3476,7 +3481,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
@@ -4290,12 +4295,12 @@ msgid "writing key binding signature\n"
 msgstr "scrittura della firma di collegamento alla chiave\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "dimensione della chiave non valida; uso %u bit\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4366,76 +4371,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (default)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (default)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (firma solo)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (cifra solo)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (cifra solo)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (firma solo)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (cifra solo)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (cifra solo)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (cifra solo)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "La coppia DSA avr� 1024 bit.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Di che dimensioni vuoi la chiave? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4451,7 +4461,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4467,40 +4477,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4508,12 +4518,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4524,7 +4534,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4541,44 +4551,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4589,7 +4599,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4604,23 +4614,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:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4628,12 +4638,19 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Inserisci la passphrase, cio� una frase segreta \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4645,7 +4662,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4657,50 +4674,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4710,12 +4727,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4723,7 +4740,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4731,26 +4748,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -5283,66 +5300,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "forzare l'algoritmo di digest %s (%d) viola le preferenze del destinatario\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "il plugin per il cifrario IDEA non � presente\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrami ulteriori informazioni\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ATTENZIONE: \"%s\" � una opzione deprecata\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "usa al suo posto \"%s%s\"\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Non compresso"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Non compresso"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
@@ -5387,28 +5404,28 @@ msgstr ""
 "ATTENZIONE: le opzioni in `%s' non sono ancora attive durante questa\n"
 "esecuzione del programma\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5421,26 +5438,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u-bit %s key, ID %08lX, created %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Inserisci la passphrase\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "interrotto dall'utente\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-# ??? (Md)
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "non esaminato"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5450,12 +5461,12 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chiave %2$s di %1$u bit, ID %3$08lX, creata il %4$s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6645,6 +6656,12 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+# ??? (Md)
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "non esaminato"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6737,19 +6754,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6798,7 +6815,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -6818,15 +6835,15 @@ msgstr "rebuild della cache del portachiavi fallito: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6845,150 +6862,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -7004,63 +7020,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usa NOME come destinatario predefinito"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "non usa per niente il terminale"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandi in conflitto\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7168,7 +7184,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
@@ -7632,147 +7648,147 @@ msgstr "la preferenza %c%lu 
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "elenca le chiavi segrete"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "certificato danneggiato"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "cambia la passphrase"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "crea un output ascii con armatura"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "non usa per niente il terminale"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "modo batch: non fa domande"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "risponde \"s�\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "risponde \"no\" a quasi tutte le domande"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "aggiungi questo portachiavi alla lista"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|usa NOME come chiave segreta predefinita"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|cerca le chiavi in questo keyserver"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di cifratura NOME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usa l'algoritmo di message digest NOME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7783,60 +7799,56 @@ msgstr ""
 "firma, controlla, cifra o decifra\n"
 "l'operazione predefinita dipende dai dati di input\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinatario predefinito `%s' sconosciuto\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Non � stata data una descrizione)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = salta questa chiave\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8012,7 +8024,7 @@ msgstr ""
 "\n"
 "Questa sar� una autofirma.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -8247,78 +8259,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "elemento della configurazione sconosciuto \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "usa come file di output"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [opzioni] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "chiave pubblica non trovata"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "scrittura della chiave segreta in `%s'\n"
@@ -8504,13 +8516,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "La coppia DSA avr� 1024 bit.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Ripeti la passphrase\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "sconosciuto"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "lettura delle opzioni da `%s'\n"
diff --git a/po/ja.po b/po/ja.po
index fdb958afd..9ca889f25 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <iida@gnu.org>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -22,71 +22,71 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -96,79 +96,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: �ϥå���ɽ�κ����˼��Ԥ��ޤ���: %s\n"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -317,262 +317,262 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "�Х��򸫤Ĥ����� <gnupg-bugs@gnu.org> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -589,8 +589,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -598,8 +598,8 @@ msgstr ""
 "@���ޥ��:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -610,91 +610,91 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "��%s�פǥ��顼: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -706,19 +706,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -730,7 +730,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -740,11 +740,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -810,40 +810,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[�桼����ID�����Ĥ���ޤ���]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent�Ȥ��̿��㳲\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
@@ -1080,6 +1080,11 @@ msgstr "
 msgid "ignoring garbage line"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[̤����]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1188,7 +1193,7 @@ msgstr "
 msgid "not human readable"
 msgstr "�ͤˤ��ɤ�ޤ���"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
@@ -1198,8 +1203,8 @@ msgstr "OpenPGP
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
@@ -1208,158 +1213,158 @@ msgstr "
 msgid "This command is only available for version 2 cards\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "�����? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[̤����]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "��"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "��"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "̵����"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "̤����"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "����"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "���顼�� �Τ٤����ASCII�������������Ĥ���Ƥ��ޤ���\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "���顼: ��<��ʸ���ϻȤ��ޤ���\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "���顼: ��Ťζ���϶ػߤǤ���\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "�����ɽ�ͭ�Ԥ��� (surname): "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "�����ɽ�ͭ�Ԥ�̾ (given name): "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "���顼: �Ĥʤ���̾����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "��������õ������URL: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "�������󡦥ǡ��� (���������̾): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "���顼: �������󡦥ǡ�����Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, fuzzy, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "���顼: URL��Ĺ�����ޤ� (���%dʸ��)��\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "���������: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "���顼: ����ʸ�����Ĺ����̵���Ǥ���\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "���顼: ����ʸ�����̵����ʸ��������ޤ���\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "���� ((M)�ˡ�(F)��������): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "���顼: ̵���ʱ�����\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA���: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "���顼: ̵���ʷ����λ��档\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "�������Ǥ��ޤ���: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "OpenPGP�����ɤǤ���ޤ���"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "��¸�θ���򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "�Ź渰�򥫡��ɳ��˥Хå����åפ��ޤ���? (Y/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "��¸�θ�����򴹤��ޤ���? (y/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1370,124 +1375,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "���Υ��ޥ�ɤ�Ȥä��ѹ����٤��Ǥ� --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "�������븰�η������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) ��̾��\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) �Ź沽��\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) ǧ�ڸ�\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "̵��������Ǥ���\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "�����ݴɾ������򤷤Ƥ�������:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "̤�Τθ��ݸ�르�ꥺ��Ǥ�\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "������̩��ʬ��̵���Ǥ�\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "��ͭ���ǡ�����ɽ��"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "�����ɽ�ͭ�Ԥ�̾�����ѹ�"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "����õ������URL���ѹ�"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "������URL�ǻ��ꤵ�줿���ΰ����Ф�"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "��������̾���ѹ�"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "�����������ѹ�"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "�����ɽ�ͭ�Ԥ����̤��ѹ�"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "CA������ѹ�"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "��̾����PIN�ե饰��ȿž"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "����������������"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "PIN�֥��å��β�����ѹ��Υ�˥塼"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "���ޥ��> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "�������ѥ��ޥ��\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -1495,7 +1500,7 @@ msgstr "̵
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
@@ -1797,37 +1802,37 @@ msgstr "
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "���ѽ�̾�����"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[�ե�����]|���ꥢ��̾�����"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "ʬΥ��̾�����"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "�ǡ�����Ź沽"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "�Ź沽�ˤ��оΰŹ�ˡ�Τߤ����"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "�ǡ��������� (����)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "��̾�򸡾�"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "�����"
 
@@ -1839,11 +1844,11 @@ msgstr "
 msgid "list and check key signatures"
 msgstr "����̾�θ����Ȱ���"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "���Ȼ���ΰ���"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "��̩���ΰ���"
 
@@ -1851,7 +1856,7 @@ msgstr "
 msgid "generate a new key pair"
 msgstr "��������������"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "�������ؤ��鸰������"
 
@@ -1879,11 +1884,11 @@ msgstr "
 msgid "export keys"
 msgstr "����񤭽Ф�"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "�������С��˸���񤭽Ф�"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "�������С����鸰���ɤ߹���"
 
@@ -1920,20 +1925,20 @@ msgstr "
 msgid "print message digests"
 msgstr "|���르�ꥺ�� [�ե�����]|��å����������ɽ��"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|̾��|��̾�����Ѥ˰Ź沽"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
@@ -1951,12 +1956,12 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "����ƥ����ȡ��⡼�ɤ����"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "̵�ѹ�"
 
@@ -1968,7 +1973,7 @@ msgstr "
 msgid "use strict OpenPGP behavior"
 msgstr "��̩��OpenPGP�ο�������"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1977,7 +1982,7 @@ msgstr ""
 "(���ޥ�ɤȥ��ץ���������ΰ����ϡ�\n"
 "�ޥ˥奢�롦�ڡ���������������)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2015,7 +2020,7 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2043,7 +2048,7 @@ msgstr "
 msgid "usage: gpg [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "��Ω���륳�ޥ��\n"
 
@@ -2119,451 +2124,451 @@ msgstr "
 msgid "unknown configuration item `%s'\n"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2576,7 +2581,7 @@ msgstr "
 msgid "make timestamp conflicts only a warning"
 msgstr "������̷���ٹ�����ˤ��ޤ�"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|�ե����뵭�һ�|���Υե����뵭�һҤ˾��֤�\n"
@@ -3353,20 +3358,20 @@ msgstr "
 msgid "Key has only stub or on-card key items - no passphrase to change.\n"
 msgstr ""
 
-#: g10/keyedit.c:1142 g10/keygen.c:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
@@ -3383,7 +3388,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
@@ -4162,12 +4167,12 @@ msgid "writing key binding signature\n"
 msgstr "���б��ؤν�̾��񤭹��ߤޤ�\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "̵���ʸ�Ĺ��%u�ӥåȤˤ��ޤ�\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
@@ -4236,76 +4241,81 @@ msgstr "   (%c) ǧ
 msgid "   (%c) Finished\n"
 msgstr "   (%c) ��λ\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "����˾�θ��μ�������򤷤Ƥ�������:\n"
 
-#: g10/keygen.c:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA��Elgamal (����)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA��Elgamal (����)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (��̾�Τ�)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (�Ź沽�Τ�)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (�Ź沽�Τ�)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (�ȼ�ǽ�Ϥ�����)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, fuzzy, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "�ɤθ�Ĺ�ˤ��ޤ���? (1024) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "�׵ᤵ�줿��Ĺ��%u�ӥå�\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4321,7 +4331,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4337,40 +4347,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4378,11 +4388,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4393,7 +4403,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4409,44 +4419,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4457,7 +4467,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4472,23 +4482,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:2105
+#: g10/keygen.c:2145
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4496,12 +4506,19 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4513,7 +4530,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4524,50 +4541,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4576,42 +4593,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -5132,65 +5149,65 @@ msgstr "%s
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "�ٹ�: ���󥢥르�ꥺ�� %s (%d) �ζ�����������ͤ���������Ω���ޤ�\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA�Ź�ˡ�Υץ饰���󤬤���ޤ���\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "�ܺ٤�http://www.gnupg.org/faq.html������������\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: ����뤵��Ƥ��륪�ץ�����%s��\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "��%s%s�ɤ�����˻ȤäƤ�������\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "�ٹ�:��%s�ɤϡ�����뤵��Ƥ��륪�ץ����Ǥ�\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "̵����"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "̵����|�ʤ�"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "���Υ�å������ϡ�%s�Ǥϻ��ѤǤ��ޤ���\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "�����ޤ��ʥ��ץ�����%s��\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
@@ -5232,26 +5249,26 @@ msgstr "
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5264,25 +5281,20 @@ msgstr ""
 "\"%.*s\"\n"
 "%u�ӥå�%s��, ID %s�������դ�%s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "�ѥ��ե졼��������\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "�桼�����ˤ���ä�\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "̤����"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5291,12 +5303,12 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
@@ -6422,6 +6434,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "̤����"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6514,19 +6531,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
@@ -6575,7 +6592,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
@@ -6595,15 +6612,15 @@ msgstr "
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
@@ -6622,147 +6639,146 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "�����ɤαʵץ��å�����%d��Admin PIN�����Ƥ��ޤ�\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -6779,60 +6795,60 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "������PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -6941,7 +6957,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
@@ -7407,148 +7423,148 @@ msgstr "
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "���֥��å��κ���˼��Ԥ��ޤ���: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "��̩���ΰ���"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "�����ʾ�����Ǥ�"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 #, fuzzy
 msgid "register a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "ASCII���������������"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "���θ����ؤ��������ޤ�"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "̤�ΤΰŹ楢�르�ꥺ��Ǥ�"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7559,60 +7575,56 @@ msgstr ""
 "��̾���������Ź沽������\n"
 "��������ϡ����ϥǡ����˰�¸\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "��%s�פ���³�Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "̤�ΤΥ��ץ�����%s��\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�����Ϥ���ޤ���)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = ���θ��ϤȤФ�\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7786,7 +7798,7 @@ msgstr "                
 msgid "This is a qualified signature\n"
 msgstr "���ʽ�̾�ˤʤ�Ǥ��礦��\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -8020,78 +8032,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "̤�Τι������ܡ�%s��\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "���ϥե�����Ȥ��ƻ���"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "�Ȥ���: gpg [���ץ����] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "�����������Ĥ���ޤ���"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
@@ -8277,6 +8289,10 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA���Ф�1024�ӥåȤˤʤ�ޤ���\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "�ѥ��ե졼���������\n"
 
@@ -8287,10 +8303,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|Admin PIN"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[̤����]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
diff --git a/po/nb.po b/po/nb.po
index d5083226c..302900f84 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <Trond.Endrestol@fagskolen.gjovik.no>\n"
 "Language-Team: Norwegian Bokm�l <i18n-nb@lister.ping.uio.no>\n"
@@ -23,70 +23,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -96,79 +96,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
@@ -306,7 +306,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -317,260 +317,260 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Vennligst rapporter feil til <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "feil ved s�king etter tillitspost i �%s�: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,8 +587,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -596,8 +596,8 @@ msgstr ""
 "@Kommandoer:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -608,88 +608,88 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "feil med �%s�: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "hemmelig n�kkel er ikke tilgjengelig"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "lesefeil ved �%s�: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -701,19 +701,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -725,7 +725,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -735,11 +735,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -805,38 +805,38 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "feil ved lesing av n�kkelblokk: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[Brukerid ikke funnet]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr ""
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -1070,6 +1070,11 @@ msgstr ""
 msgid "ignoring garbage line"
 msgstr "feil i trailerlinje\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[ikke satt]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1176,7 +1181,7 @@ msgstr "ingen gyldig OpenPGP-data funnet.\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
@@ -1186,8 +1191,8 @@ msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1196,157 +1201,157 @@ msgstr "kan ikke gj
 msgid "This command is only available for version 2 cards\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ditt valg? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[ikke satt]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "mann"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "dame"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "uspesifisert"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "ikke tvunget"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "tvunget"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Feil: Bare ren ASCII er forel�pig tillatt.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Feil: Tegnet �<� kan ikke brukes.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Feil: Doble mellomrom er ikke tillatt.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Kortholders etternavn: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Kortholders fornavn: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Feil: Det kombinerte navnet er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL for � hente offentlig n�kkel: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Feil: URL er for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "feil ved opprettelse av n�kkelknippet �%s�: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Logindata (kontonavn): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Feil: Logindata er for langt (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Feil: Privat DO for lang (grensa g�r ved %d tegn).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Spr�kpreferanser:"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Feil: ugyldig lengde p� preferansestrengen.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Feil: ugyldig tegn i preferansestrengen.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kj�nn ((M)ale, (F)emale eller mellomrom): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Feil: ugyldig respons.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtrykk: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Feil: ugyldig formattert fingeravtrykk.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "n�kkeloperasjonen er umulig: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "ikke et OpenPGP-kort"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Erstatte eksisterende n�kkel? (j/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Lage sikkerhetskopi av krypteringsn�kler utenfor kortet? (J/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Erstatte eksisterende n�kler? (j/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1357,124 +1362,124 @@ msgstr ""
 "   PIN = �%s�     Admin PIN = �%s�\n"
 "Du b�r endre dem med kommandoen --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Vennligst velg hvilken type n�kkel du vil generere:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signaturn�kkel\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsn�kkel\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsn�kkel\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ugyldig valg.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Vennligst velg hvor n�kkelen skal lagres:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "ukjent n�kkelbeskyttelsesalgoritme\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "hemmelige deler av n�kkelen er ikke tilgjengelig.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "vis alle tilgjengelige data"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "endre kortholders navn"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "endre URL for � hente n�kkel"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "hente n�kkelen angitt i URL som er lagret i kortet"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "endre loginnavnet"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "endre spr�kpreferansene"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "endre kortholders kj�nn"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "vise et CA-fingeravtrykk"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "veksle tving-signatur-PIN-flagget"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "generere nye n�kler"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "meny for � endre eller fjerne blokkering av PIN"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "bekrefte PIN og vise alle data"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "Admin-reservert kommando\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Admin-kommandoer er tillatt\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
@@ -1482,7 +1487,7 @@ msgstr "Ugyldig kommando  (pr
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
@@ -1790,37 +1795,37 @@ msgstr "bruker undern
 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fil]|lage en signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fil]|lage en klartekstsignatur"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "lage en adskilt signatur"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "kryptere data"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "kryptering med bare symmetrisk cipher"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "dekryptere data (standard)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "bekrefte en signatur"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "liste n�kler"
 
@@ -1832,11 +1837,11 @@ msgstr "liste n
 msgid "list and check key signatures"
 msgstr "vise og sjekke n�kkelsignaturer"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "liste n�kler og fingeravtrykk"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "liste hemmelige n�kler"
 
@@ -1844,7 +1849,7 @@ msgstr "liste hemmelige n
 msgid "generate a new key pair"
 msgstr "generere et nytt n�kkelpar"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "fjerne n�kler fra det offentlige n�kkelknippet"
 
@@ -1872,11 +1877,11 @@ msgstr "generere et opphevingssertifikat"
 msgid "export keys"
 msgstr "eksportere n�kler"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "eksportere n�kler til en n�kkelserver"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importere n�kler fra en n�kkelserver"
 
@@ -1913,20 +1918,20 @@ msgstr "oppdatere tillitsdatabasen"
 msgid "print message digests"
 msgstr "|algo [filer]|skrive meldingsdigester"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAVN|kryptere for NAVN"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "bruke denne brukeriden for signering eller dekryptering"
@@ -1940,12 +1945,12 @@ msgstr "|N|sette kompresjonsniv
 msgid "use canonical text mode"
 msgstr "bruk kanonisk tekstmodus"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "ikke gj�r noen endringer"
 
@@ -1957,7 +1962,7 @@ msgstr "sp
 msgid "use strict OpenPGP behavior"
 msgstr "bruk streng OpenPGP-oppf�rsel"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1965,7 +1970,7 @@ msgstr ""
 "@\n"
 "(Se mansiden for en komplett liste over alle kommandoene og valgene)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2003,7 +2008,7 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2031,7 +2036,7 @@ msgstr "Kompresjon: "
 msgid "usage: gpg [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "motstridende kommandoer\n"
 
@@ -2116,445 +2121,445 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "vise navnet til n�kkelknippene i n�kkellister"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2567,7 +2572,7 @@ msgstr "hent n
 msgid "make timestamp conflicts only a warning"
 msgstr "la konflikter mellom tidsstempler bare v�re en advarsel"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skrive statusinfo til denne FD"
 
@@ -3335,19 +3340,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemmelige deler av prim�rn�kkelen er lagret p� kort.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
@@ -3362,7 +3367,7 @@ msgid ""
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
@@ -4096,12 +4101,12 @@ msgid "writing key binding signature\n"
 msgstr "skriver n�kkelbindende signatur\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "n�kkelst�rrelsen er ugyldig; bruker %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
@@ -4174,76 +4179,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA og ElGamal (standard)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA og ElGamal (standard)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (bare signering)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (sette dine egne muligheter)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (bare kryptering)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (bare signering)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (bare kryptering)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (bare kryptering)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (sette dine egne muligheter)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (sette dine egne muligheter)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-n�kkelpar vil ha %u bits.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Hvilken n�kkelst�rrelse vil du ha? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4259,7 +4269,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:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4275,38 +4285,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4314,11 +4324,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4329,7 +4339,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4345,44 +4355,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4393,7 +4403,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
@@ -4409,23 +4419,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4433,12 +4443,21 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
+"\n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4450,7 +4469,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4462,50 +4481,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4514,13 +4533,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4529,7 +4548,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4537,27 +4556,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -5077,65 +5096,65 @@ msgstr "ADVARSEL: bruker eksperimentell digest-algoritme %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ADVARSEL: digestalgoritmen �%s� er avlegs\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "vennligst se %s for mer informasjon\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr ""
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr ""
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr ""
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "flertydig valg �%s�\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "ukjent valg �%s�\n"
@@ -5177,26 +5196,26 @@ msgstr "ny konfigurasjonsfil 
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5209,25 +5228,20 @@ msgstr ""
 "�%.*s�\n"
 "%u-bit %s n�kkel, ID %s, opprettet %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Tast inn passfrase\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "ikke tvunget"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5236,12 +5250,12 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6359,6 +6373,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ikke tvunget"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6451,19 +6470,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
@@ -6512,7 +6531,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
@@ -6532,15 +6551,15 @@ msgstr "klarte ikke 
 msgid "reading public key failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "respons inneholder ikke data om offentlig n�kkel\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "respons inneholder ikke RSA-modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
@@ -6559,145 +6578,144 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "feil ved henting av CHV-status fra kort\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d Admin PIN-fors�k f�r kortet blir l�st permanent\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN for CHV%d er for kort; minum lengde er %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtall %s mangler eller har ikke en st�rrelse p� %d bits\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -6714,60 +6732,60 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "vise admin-kommandoer"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -6873,7 +6891,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "lesing av offentlig n�kkel mislyktes: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
@@ -7339,147 +7357,147 @@ msgstr "preferansen %s er duplisert\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "sleting av n�kkelblokk mislyktes: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "ingen gyldige adressater\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "liste hemmelige n�kler"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "ugyldig sertifikat"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "endre passfrasen"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "lage ASCII-beskyttet output"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "hent n�klene fra dette n�kkelknippet"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "ukjent kryptoalgoritme"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s signatur, digestalgoritme %s\n"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7490,60 +7508,56 @@ msgstr ""
 "signere, sjekke, kryptere eller dekryptere\n"
 "standard operasjon avhenger av inputdata\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "ukjent valg �%s�\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = hopp over denne n�kkelen\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7717,7 +7731,7 @@ msgstr "                aka 
 msgid "This is a qualified signature\n"
 msgstr "Dette vil v�re en selvsignatur.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "avslutt"
@@ -7950,78 +7964,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "ukjent konfigurasjonspunkt �%s�\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "bruk som outputfil"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "bruksm�te: gpg [valg] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "fant ikke offentlig n�kkel"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Admin-kommandoer er ikke tillatt\n"
@@ -8207,6 +8221,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-n�kkelpar vil ha %u bits.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Gjenta passfrase\n"
 
@@ -8217,10 +8234,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|Admin PIN"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[ikke satt]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "leser valg fra �%s�\n"
diff --git a/po/pl.po b/po/pl.po
index 0ee5a1339..c2e819375 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -24,66 +24,66 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie uda�o si� uzyska� blokady pinentry: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "Prosz� wprowadzi� sw�j PIN, �eby odblokowa� klucz tajny dla tej sesji"
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr ""
 "Prosz� wprowadzi� swoje has�o, �eby odblokowa� klucz tajny dla tej sesji"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pr�ba %d z %d)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "PIN zbyt d�ugi"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "Has�o zbyt d�ugie"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "PIN zbyt kr�tki"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "Niepoprawne has�o"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "Has�o"
 
@@ -92,66 +92,66 @@ msgstr "Has
 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "b��d pobierania numeru seryjnego karty: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "wykryto kart� o numerze seryjnym: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "b��d pobierania domy�lnego keyID uwierzytelnienia karty: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nie znaleziono pasuj�cego klucza karty: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "zaciemnienie klucza nie powiod�o si�: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "b��d zapisu klucza: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Prosz� wprowadzi� has�o dla klucza ssh%0A  %c"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "Prosz� ponownie wprowadzi� to has�o"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -160,12 +160,12 @@ msgstr ""
 "Prosz� wprowadzi� has�o do zabezpieczenia odebranego klucza tajnego%%0A   %s%"
 "%0A w miejscu przechowywania kluczy gpg-agenta"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "nie uda�o si� utworzy� strumienia z gniazda: %s\n"
@@ -314,7 +314,7 @@ msgstr "Prosz
 msgid "Please enter the new passphrase"
 msgstr "Prosz� wprowadzi� nowe has�o"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -323,109 +323,109 @@ msgstr ""
 "@Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�w"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "wyj�cie polece� w stylu sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "wyj�cie polece� w stylu csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "nie odczepianie od konsoli"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "nie przechwytywanie klawiatury i myszy"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "u�ycie pliku loga dla serwera"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "u�ycie standardowego po�o�enia gniazda"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|u�ycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|u�ycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "nie u�ywanie SCdaemona"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie ��da� zmiany TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie ��da� zmiany ekranu X"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pami�tanych PIN-�w po N sekundach"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane has�o"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "w��czenie emulacji ssh-agenta"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "B��dy prosimy zg�asza� na adres <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg-agent [opcje] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -433,145 +433,145 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, 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:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "b��d tworzenia ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� gniazda: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent ju� dzia�a - nie uruchamianie nowego\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() nie powiod�o si�: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nie mo�na u�y� ,,%s'' jako katalogu domowego\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "b��d odczytu z %s: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obs�uga 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obs�uga 0x%lx dla fd %d zako�czona\n"
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "obs�uga ssh 0x%lx dla fd %d uruchomiona\n"
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "obs�uga ssh 0x%lx dla fd %d zako�czona\n"
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select nie powiod�o si�: %s - czekanie 1s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -590,8 +590,8 @@ msgstr ""
 "Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pami�ci hase�\n"
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -599,8 +599,8 @@ msgstr ""
 "@Polecenia:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -611,11 +611,11 @@ msgstr ""
 "Opcje:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Wywo�anie: gpg-protect-tool [opcje] (-h podaje pomoc)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -623,22 +623,22 @@ msgstr ""
 "Sk�adnia: gpg-protect-tool [opcje] [argumenty]\n"
 "Narz�dzie do utrzymywania kluczy tajnych\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Prosz� wprowadzi� has�o do odbezpieczenia obiektu PKCS#12."
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Prosz� wprowadzi� has�o do zabezpieczenia obiektu PKCS#12."
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Prosz� wprowadzi� has�o do zabezpieczenia wa�nego obiektu w systemie GnuPG."
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -646,55 +646,55 @@ msgstr ""
 "Prosz� wprowadzi� has�o lub PIN\n"
 "Potrzebny do zako�czenia tej operacji."
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Has�o:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "anulowano\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "b��d podczas pytania o has�o: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "b��d podczas otwierania ,,%s'': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "plik ,,%s'', linia %d: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "instrukcja \"%s\" zignorowana w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemowa lista zaufania ,,%s'' niedost�pna\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "b��dny odcisk w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "nieprawid�owa flaga klucza w ,,%s'', w linii %d\n"
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "b��d odczytu ,,%s'', w linii %d: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
 
@@ -706,7 +706,7 @@ msgstr "b
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -715,11 +715,11 @@ msgstr ""
 "Czy absolutnie ufasz, �e%%0A  ,,%s''%%0Apoprawnie po�wiadcza certyfikaty "
 "u�ytkownik�w?"
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "Nie"
 
@@ -731,7 +731,7 @@ msgstr "Nie"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -743,11 +743,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "Akceptuj"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -813,37 +813,37 @@ msgstr "b
 msgid "error running `%s': terminated\n"
 msgstr "b��d uruchamiania ,,%s'': zako�czono\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "b��d tworzenia gniazda: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "nie znaleziono hosta"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie jest dost�pny w tej sesji\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nie mo�na si� po��czy� z ,,%s'': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "problem z komunikacj� z gpg-agentem\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem z ustawieniem opcji gpg-agenta\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "problem z agentem\n"
 
@@ -1081,6 +1081,10 @@ msgstr "Brak pomocy o ,,%s''"
 msgid "ignoring garbage line"
 msgstr "b��d w linii ko�cz�cej\n"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[brak]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1189,7 +1193,7 @@ msgstr "OSTRZE
 msgid "not human readable"
 msgstr "nieczytelne dla cz�owieka"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Karta OpenPGP niedost�pna: %s\n"
@@ -1199,8 +1203,8 @@ msgstr "Karta OpenPGP niedost
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kart� OpenPGP nr %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1209,158 +1213,158 @@ msgstr "nie dzia
 msgid "This command is only available for version 2 cards\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Tw�j wyb�r? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[nie ustawiono]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "m�czyzna"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "kobieta"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "nie podano"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "nie wymuszono"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "wymuszono"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "B��d: aktualnie dopuszczalne jest tylko czyste ASCII.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "B��d: znak ,,<'' nie mo�e by� u�yty.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "B��d: podw�jne spacje nie s� dopuszczalne.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Nazwisko posiadacza karty: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Imi� posiadacza karty: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "B��d: pe�ne personalia zbyt d�ugie (limit to %d znak�w).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL do odczytania klucza publicznego: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "B��d: URL zbyt d�ugi (limit to %d znak�w).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "b��d przydzielania wystarczaj�cej ilo�ci pami�ci: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "b��d odczytu ,,%s'': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Dane logowania (nazwa konta): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "B��d: dane logowania zbyt d�ugie (limit to %d znak�w).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Prywatne dane DO: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "B��d: prywatne DO zbyt d�ugie (limit to %d znak�w).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Preferowane j�zyki: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "B��d: niew�a�ciwa d�ugo�� tekstu preferencji.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "B��d: niew�a�ciwe znaki w tek�cie preferencji.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "P�e� (M - m�czyzna, F - kobieta lub spacja): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "B��d: niew�a�ciwa odpowied�.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "Odcisk CA:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "B��d: niew�a�ciwie sformatowany odcisk.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "operacja na kluczu niewykonalna: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "to nie jest karta OpenPGP"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "b��d podczas odczytu aktualnych informacji o kluczu: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Zast�pi� istniej�cy klucz? (t/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Stworzy� poza kart� kopi� zapasow� klucza szyfruj�cego? (T/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Zast�pi� istniej�ce klucze? (t/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1371,124 +1375,124 @@ msgstr ""
 "   PIN = ,,%s''   PIN administratora = ,,%s''\n"
 "Nale�y je zmieni� przy u�yciu polecenia --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Prosz� wybra� rodzaj klucza do wygenerowania:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Klucz do podpis�w\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Klucz do szyfrowania\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Klucz do uwierzytelniania\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Niew�a�ciwy wyb�r.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Prosz� wybra� gdzie zapisa� klucz:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "nieznany algorytm ochrony klucza\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "cz�ci tajne klucza s� niedost�pne\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "klucz prywatny jest ju� zapisany na karcie\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "pokazanie polece� administratora"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "wypisanie wszystkich dost�pnych danych"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "zmiana nazwy posiadacza karty"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "zmiana URL-a do odczytu klucza"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "pobranie klucza okre�lonego w URL-u karty"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "zmiana nazwy logowania"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "zmiana preferowanych j�zyk�w"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "zmiana p�ci posiadacza karty"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "zmiana odcisku CA"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "zmiana flagi wymuszenia PIN-u do podpisu"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "wygenerowanie nowych kluczy"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "menu do zmiany lub odblokowania PIN-u"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "sprawdzenie PIN-u i wypisanie wszystkich danych"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Polecenie> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "Polecenie tylko dla administratora\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Polecenia dla administratora s� dozwolone\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie s� dozwolone\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 
@@ -1496,7 +1500,7 @@ msgstr "Niepoprawne polecenie  (spr
 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:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
@@ -1803,37 +1807,37 @@ msgstr "u
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[plik]|z�o�enie podpisu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[plik]|z�o�enie podpisu pod dokumentem"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "z�o�enie podpisu oddzielonego od dokumentu"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "szyfrowanie danych"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "szyfrowanie tylko szyfrem symetrycznym"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "odszyfrowywanie danych (domy�lne)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "sprawdzenie podpisu"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "lista kluczy"
 
@@ -1845,11 +1849,11 @@ msgstr "lista kluczy i podpis
 msgid "list and check key signatures"
 msgstr "wypisanie i sprawdzenie podpis�w kluczy"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "lista kluczy i ich odcisk�w"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "lista kluczy prywatnych"
 
@@ -1857,7 +1861,7 @@ msgstr "lista kluczy prywatnych"
 msgid "generate a new key pair"
 msgstr "generacja nowej pary kluczy"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "usuni�cie klucza ze zbioru kluczy publicznych"
 
@@ -1885,11 +1889,11 @@ msgstr "tworzenie certyfikatu uniewa
 msgid "export keys"
 msgstr "eksport kluczy do pliku"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "eksport kluczy do serwera kluczy"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "import kluczy z serwera kluczy"
 
@@ -1926,20 +1930,20 @@ msgstr "uaktualnienie bazy zaufania"
 msgid "print message digests"
 msgstr "|algo [pliki]|skr�ty wiadomo�ci"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAZWA|szyfrowanie dla odbiorcy NAZWA"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "identyfikator do podpisania lub odszyfrowania"
@@ -1953,12 +1957,12 @@ msgstr "|N|poziom kompresji N (0 - bez)"
 msgid "use canonical text mode"
 msgstr "kanoniczny format tekstowy"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "pozostawienie bez zmian"
 
@@ -1970,7 +1974,7 @@ msgstr "pytanie przed nadpisaniem plik
 msgid "use strict OpenPGP behavior"
 msgstr "�cis�e zachowanie OpenPGP"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1978,7 +1982,7 @@ msgstr ""
 "@\n"
 "(Pe�n� list� polece� i opcji mo�na znale�� w podr�czniku systemowym.)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2018,7 +2022,7 @@ msgstr ""
 "podpisywanie, sprawdzanie podpis�w, szyfrowanie, deszyfrowanie\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2046,7 +2050,7 @@ msgstr "Kompresji: "
 msgid "usage: gpg [options] "
 msgstr "wywo�anie: gpg [opcje]"
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "sprzeczne polecenia\n"
 
@@ -2137,453 +2141,453 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nieznana opcja konfiguracyjna ,,%s''\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "wy�wietlenie ID zdj�� przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "pokazywanie URL-i polityk przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "pokazywanie wszystkich adnotacji przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "pokazywanie standardowych adnotacji IETF przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "pokazywanie adnotacji u�ytkownika przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy wypisywaniu kluczy"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 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:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "pokazywanie uniewa�nionych i wygas�ych podkluczy na listach kluczy"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "pokazywanie nazwy zbioru kluczy na listach kluczy"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "pokazywanie dat wyga�ni�cia przy wypisywaniu podpis�w"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, 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:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 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:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z danymi PKA"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -2596,7 +2600,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:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|pisanie opisu stanu do deskryptora FD"
 
@@ -3383,19 +3387,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 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:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
@@ -3412,7 +3416,7 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
@@ -4186,12 +4190,12 @@ msgid "writing key binding signature\n"
 msgstr "zapis podpisu wi���cego klucz\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "niew�a�ciwa d�ugo�� klucza; wykorzystano %u bit�w\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
@@ -4262,76 +4266,81 @@ msgstr "   (%c) Prze
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Zako�czenie\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Prosz� wybra� rodzaj klucza:\n"
 
-#: g10/keygen.c:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) Para kluczy dla algorytm�w DSA i Elgamala (domy�lne)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) Para kluczy dla algorytm�w DSA i Elgamala (domy�lne)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (mo�liwo�ci do ustawienia)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Klucz dla algorytmu Elgamala (tylko do szyfrowania)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (tylko do podpisywania)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Klucz dla algorytmu Elgamala (tylko do szyfrowania)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (tylko do szyfrowania)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (mo�liwo�ci do ustawienia)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (mo�liwo�ci do ustawienia)\n"
 
-#: g10/keygen.c:1731
-#, 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:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Jakiej d�ugo�ci klucz wygenerowa�? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 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:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4347,7 +4356,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:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4363,38 +4372,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:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci wa�no�� %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4402,11 +4411,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/N)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4417,7 +4426,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4433,44 +4442,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <tzb@ziemianska.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 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:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4481,7 +4490,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
@@ -4498,25 +4507,25 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4524,12 +4533,20 @@ msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Prosz� wprowadzi� has�o do zabezpieczenia wa�nego obiektu w systemie GnuPG."
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4541,7 +4558,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4557,50 +4574,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w ,,%s''\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� za�lepk� klucza tajnego w ,,%s''\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w ,,%s''\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4608,12 +4625,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4621,7 +4638,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4629,26 +4646,26 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? (t/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zapis klucza na karcie nie powi�d� si�: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, 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:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -5175,66 +5192,66 @@ msgstr "OSTRZE
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "OSTRZE�ENIE: algorytm skr�tu %s jest odradzany\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "modu� szyfru IDEA nie jest dost�pny\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "obja�nienie mo�na przeczyta� tutaj: %s\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d jest przestarza�� opcj� ,,%s''\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "OSTRZE�ENIE: ,,%s'' jest przestarza�� opcj�.\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "w jej miejsce nale�y u�y� ,,%s%s''\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, 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:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Nieskompresowany"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "nieskompresowany|brak"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "niejednoznaczna opcja ,,%s''\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "nieznana opcja ,,%s''\n"
@@ -5276,28 +5293,28 @@ msgstr "nowy plik ustawie
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID g��wnego klucza %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5310,25 +5327,20 @@ msgstr ""
 ",,%.*s''.\n"
 "Klucz o d�ugo�ci %u bit�w, typ %s, ID %s, stworzony %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Has�o\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "anulowano przez u�ytkownika\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem z agentem: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "[B��d - brak pami�ci]"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5337,12 +5349,12 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 ",,%s''\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ugo�� %u bit�w, typ %s, numer %s, stworzony %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podklucz dla g��wnego klucza o ID %s)"
@@ -6495,6 +6507,11 @@ msgstr "opcja ,,%.50s'' jest niejednoznaczna\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "polecenie ,,%.50s'' jest niejednoznaczne\n"
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "[B��d - brak pami�ci]"
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6587,19 +6604,19 @@ msgstr ""
 "Sk�adnia: kbxutil [opcje] [pliki]\n"
 "wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "reszta RSA brakuj�ca lub o rozmiarze innym ni� %d bity\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "publiczny wyk�adnik RSA brakuj�cy lub wi�kszy ni� %d bity\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
@@ -6648,7 +6665,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
@@ -6668,15 +6685,15 @@ msgstr "nie powi
 msgid "reading public key failed: %s\n"
 msgstr "odczyt klucza publicznego nie powi�d� si�: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "odpowied� nie zawiera danych klucza publicznego\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpowied� nie zawiera wsp�czynnika RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
 
@@ -6695,147 +6712,146 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN dla CHV%d jest zbyt kr�tki; minimalna d�ugo�� to %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "b��d podczas odczytu stanu CHV z karty\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "karta zosta�a trwale zablokowana!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "Zosta�o %d pr�b PIN-u administratora do trwa�ego zablokowania karty\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "||Prosz� wprowadzi� PIN na klawiaturze czytnika%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "dost�p do polece� administratora nie zosta� skonfigurowany\n"
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN dla CHV%d jest zbyt kr�tki; minimalna d�ugo�� to %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administratora"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "b��d podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "b��d podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "klucz ju� istnieje\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "istniej�cy klucz zostanie zast�piony\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "liczba pierwsza %s RSA brakuj�ca lub o rozmiarze innym ni� %d bit�w\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powi�d� si� zapis klucza: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "prosz� czeka� na wygenerowanie klucza...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiod�o si�\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generowanie klucza zako�czone (%d sekund)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza si� z ��danym\n"
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "karta nie obs�uguje algorytmu skr�tu %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpis�w: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
@@ -6852,53 +6868,53 @@ msgstr "||Prosz
 msgid "|N|Initial New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|POZIOM|ustawienie POZIOMU diagnostyki"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|po��czenie z czytnikiem na porcie N"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAZWA|u�ycie NAZWY jako sterownika ct-API"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAZWA|u�ycie NAZWY jako sterownika PC/SC"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "nie u�ywanie wewn�trznego sterownika CCID"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "nie u�ywanie klawiatury czytnika"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "zezwolenie na u�ycie polece� karty administratora"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Wywo�anie: scdaemon [opcje] (-h podaje pomoc)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6906,7 +6922,7 @@ msgstr ""
 "Sk�adnia: scdaemon [opcje] [polecenie [argumenty]]\n"
 "Demon kart procesorowych dla GnuPG\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "prosz� u�y� opcji ,,--daemon'' do uruchomienia programu w tle\n"
 
@@ -7012,7 +7028,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "zaciemnienie klucza nie powiod�o si�: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "nie uda�o si� przydzieli� uchwytu keyDB\n"
 
@@ -7458,140 +7474,140 @@ msgstr "certyfikat ,,%s'' usuni
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "usuni�cie certyfikatu ,,%s'' nie powiod�o si�: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "nie podano poprawnych adresat�w\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "wypisanie kluczy zewn�trznych"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "wypisanie �a�cucha certyfikat�w"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "import certyfikat�w"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "eksport certyfikat�w"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "zarejestrowanie karty procesorowej"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "przekazanie polecenia do dirmngr"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "wywo�anie gpg-protect-tool"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "zmiana has�a"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "tworzenie wyj�cia zakodowanego base-64"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "przyj�cie wej�cia w formacie PEM"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "przyj�cie wej�cia w formacie base-64"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "przyj�cie wej�cia w formacie binarnym"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "u�ycie systemowego dirmngr je�li jest dost�pny"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "pomini�cie CRL"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "sprawdzenie poprawno�ci przy u�yciu OCSP"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|liczba certyfikat�w do do��czenia"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|PLIK|pobranie informacji o polityce z PLIKU"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "nie sprawdzanie polityk certyfikat�w"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "pobranie brakuj�cych certyfikat�w wystawc�w"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "nie u�ywanie w og�le terminala"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 #, fuzzy
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|PLIK|zapisanie log�w trybu serwerowego do PLIKu"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "tryb wsadowy: bez �adnych pyta�"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "przyj�cie odpowiedzi ,,tak'' na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "przyj�cie odpowiedzi ,,nie'' na wi�kszo�� pyta�"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "dodanie tego zbioru kluczy do listy zbior�w kluczy"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAZWA|u�ycie NAZWY jako domy�lnego klucza tajnego"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|u�ycie tego serwera do wyszukiwania kluczy"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAZWA|u�ycie tego algorytmu szyfrowania NAZWA"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAZWA|u�ycie tego algorytmu skr�tu wiadomo�ci"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Wywo�anie: gpgsm [opcje] [pliki] (-h podaje pomoc)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7602,59 +7618,55 @@ msgstr ""
 "MIME\n"
 "domy�lnie wykonywana operacja zale�y od danych wej�ciowych\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "wywo�anie: gpgsm [opcje]"
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nieznany model poprawno�ci ,,%s''\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "linia %d: nie podano nazwy przedmiotu\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  p = pomini�cie tego klucza\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "to polecenie nie zosta�o jeszcze zaimplementowane\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7834,7 +7846,7 @@ msgstr "                        alias"
 msgid "This is a qualified signature\n"
 msgstr "To jest podpis kwalifikowany\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "cicho"
 
@@ -8066,57 +8078,57 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr "Uwaga, okre�lenia grup s� ignorowane\n"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "lista wszystkich komponent�w"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr "sprawdzenie wszystkich program�w"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|wypisanie opcji"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|zmiana opcji"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 #, fuzzy
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|zmiana opcji"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr "zastosowanie globalnych warto�ci domy�lnych"
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "sprawdzenie globalnego pliku konfiguracyjnego"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "plik wyj�ciowy"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "uaktywnienie zmian w czasie dzia�ania o ile to mo�liwe"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Wywo�anie: gpgconf [opcje] (-h podaje pomoc)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -8124,19 +8136,19 @@ msgstr ""
 "Sk�adnia: gpgconf [opcje]\n"
 "Zarz�dzanie opcjami konfiguracji dla narz�dzi z systemu GnuPG\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "wywo�anie: gpgconf [opcje]"
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "Wymagany jest jeden argument komponentu"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "Nie znaleziono komponentu"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "Argument nie jest dozwolony"
 
@@ -8319,6 +8331,12 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Para kluczy DSA b�dzie mia�a %u bit�w d�ugo�ci.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "to polecenie nie zosta�o jeszcze zaimplementowane\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Powt�rzone has�o\n"
 
@@ -8330,9 +8348,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|PIN administratora"
 
-#~ msgid "[none]"
-#~ msgstr "[brak]"
-
 #~ msgid "read options from file"
 #~ msgstr "odczyt opcji z pliku"
 
diff --git a/po/pt.po b/po/pt.po
index a6710ed90..d0800ec20 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <morais@kde.org>\n"
 "Language-Team: pt <morais@kde.org>\n"
@@ -22,70 +22,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -95,79 +95,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nenhum porta-chaves secreto com permiss�es de escrita encontrado: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de dispers�o: %s\n"
@@ -305,7 +305,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -316,263 +316,263 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "base de dados de confian�a: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -589,8 +589,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -598,8 +598,8 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -610,91 +610,91 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "armadura: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -706,19 +706,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -730,7 +730,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -740,11 +740,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -810,40 +810,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[Utilizador n�o encontrado]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "o gpg-agent n�o est� dispon�vel nesta sess�o\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel ligar a `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "problemas na comunica��o com o gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
@@ -1081,6 +1081,11 @@ msgstr "Nenhuma ajuda dispon
 msgid "ignoring garbage line"
 msgstr "erro na �ltima linha\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "vers�o desconhecida"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1192,7 +1197,7 @@ msgstr "AVISO: dados de nota
 msgid "not human readable"
 msgstr "n�o leg�vel por humanos"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -1202,8 +1207,8 @@ msgstr "chave secreta n
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1213,170 +1218,170 @@ msgstr "imposs
 msgid "This command is only available for version 2 cards\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Op��o? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "Nenhum motivo especificado"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "prefer�ncias actualizadas"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "caracter inv�lido na cadeia de caract�res da prefer�ncia\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "%s: vers�o de ficheiro inv�lida %d\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1384,140 +1389,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "motivo da revoca��o: "
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1525,7 +1530,7 @@ msgstr "Comando inv
 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:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1839,37 +1844,37 @@ msgstr "usando chave secund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[ficheiro]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "cifrar dados"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "cifrar apenas com cifra sim�trica"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "decifrar dados (ac��o por omiss�o)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1882,11 +1887,11 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
@@ -1894,7 +1899,7 @@ msgstr "listar as chaves secretas"
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "remover chaves do porta-chaves p�blico"
 
@@ -1922,11 +1927,11 @@ msgstr "gerar um certificado de revoga
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor de chaves"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor de chaves"
 
@@ -1963,20 +1968,20 @@ msgstr "actualizar a base de dados de confian
 msgid "print message digests"
 msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|cifrar para NOME"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
@@ -1994,12 +1999,12 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -2011,7 +2016,7 @@ msgstr "perguntar antes de sobrep
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2019,7 +2024,7 @@ msgstr ""
 "@\n"
 "(Veja a p�gina man para uma lista completa de comandos e op��es)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2057,7 +2062,7 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2085,7 +2090,7 @@ msgstr "Compress
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "comandos em conflito\n"
 
@@ -2161,463 +2166,463 @@ msgstr "AVISO: permiss
 msgid "unknown configuration item `%s'\n"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "mostrar em que porta-chave a chave est�"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, 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:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, 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:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 #, 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:3161
+#: g10/gpg.c:3156
 #, 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, 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:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 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:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2632,7 +2637,7 @@ msgstr "Remover esta chave do porta-chaves?"
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DF|escrever informa��es de estado para o\n"
@@ -3440,20 +3445,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Componentes secretas da chave prim�ria n�o dispon�veis.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3470,7 +3475,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
@@ -4274,12 +4279,12 @@ msgid "writing key binding signature\n"
 msgstr "a escrever a assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "tamanho de chave inv�lido; a utilizar %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4350,76 +4355,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (por omiss�o)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (apenas cifragem)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (apenas cifragem)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas cifragem)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (apenas cifragem)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (apenas cifragem)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "O par de chaves DSA ter� 1024 bits.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Qual o tamanho de chave desejado? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4435,7 +4445,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4451,40 +4461,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4492,12 +4502,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4508,7 +4518,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4526,44 +4536,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 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:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4574,7 +4584,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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 "
@@ -4591,23 +4601,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4615,12 +4625,19 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Por favor digite a frase secreta \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4632,7 +4649,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4644,50 +4661,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, 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:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4696,12 +4713,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4709,7 +4726,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4717,26 +4734,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -5273,67 +5290,67 @@ msgstr ""
 "for�ar o algoritmo de 'digest' %s (%d) viola as prefer�ncias do "
 "destinat�rio\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "o 'plugin' com a cifra IDEA n�o est� presente\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = mostrar mais informa��es\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op��o depreciada \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: \"%s\" � uma op��o depreciada\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "por favor utilize \"%s%s\" em vez dela\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
@@ -5376,26 +5393,26 @@ msgstr "criado um novo ficheiro de configura
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5410,25 +5427,20 @@ msgstr ""
 "\"%.*s\"\n"
 "chave %u bits %s, ID %08lx, criada %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Insira a frase secreta\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "cancelado pelo utilizador\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "n�o processado"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5438,12 +5450,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6611,6 +6623,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "n�o processado"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6703,19 +6720,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6764,7 +6781,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -6784,15 +6801,15 @@ msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6811,150 +6828,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revoca��o: "
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6970,63 +6986,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio por omiss�o"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos em conflito\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7134,7 +7150,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7601,149 +7617,149 @@ msgstr "prefer
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "resposta do agente inv�lida\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "certificado incorrecto"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "modo n�o-interactivo: nunca perguntar"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr ""
 "adicionar este porta-chaves\n"
 "� lista de porta-chaves"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|usar NOME como chave secreta por omiss�o"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7754,60 +7770,56 @@ msgstr ""
 "assina, verifica, cifra ou decifra\n"
 "a opera��o por omiss�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "uso: gpg [op��es] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio por omiss�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = saltar esta chave\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7983,7 +7995,7 @@ msgstr ""
 "\n"
 "Isto ser� uma auto-assinatura.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -8220,78 +8232,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "criado um novo ficheiro de configura��o `%s'\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "usar como ficheiro de sa�da"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "a escrever chave privada para `%s'\n"
@@ -8476,13 +8488,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "O par de chaves DSA ter� 1024 bits.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Repita a frase secreta\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "vers�o desconhecida"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "a ler op��es de `%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e05c0fdc3..45b8ef749 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -26,70 +26,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Por favor digite a frase secreta"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -99,79 +99,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, fuzzy, c-format
 msgid "can't create `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Por favor digite a frase secreta"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
@@ -310,7 +310,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -321,260 +321,260 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Por favor comunique bugs para <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, fuzzy, c-format
 msgid "error creating `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "banco de dados de confiabilidade: leitura falhou (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -591,8 +591,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -600,8 +600,8 @@ msgstr ""
 "@Comandos:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -612,90 +612,90 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr ""
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "erro de leitura: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -707,19 +707,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -731,7 +731,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -741,11 +741,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -811,38 +811,38 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "%s: usu�rio n�o encontrado\n"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr ""
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, fuzzy, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr ""
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr ""
 
@@ -1085,6 +1085,11 @@ msgstr "Nenhuma ajuda dispon
 msgid "ignoring garbage line"
 msgstr "erro na linha \"trailer\"\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "vers�o desconhecida"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1198,7 +1203,7 @@ msgstr "AVISO: dados de nota
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "chave secreta n�o dispon�vel"
@@ -1208,8 +1213,8 @@ msgstr "chave secreta n
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1218,171 +1223,171 @@ msgstr "imposs
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "a chave p�blica n�o est� mais dispon�vel"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Sua op��o? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr ""
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "n�o processado(s)"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "lista prefer�ncias"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "Impress�o digital:"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "erro: impress�o digital inv�lida\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 #, fuzzy
 msgid "Replace existing key? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 #, fuzzy
 msgid "Replace existing keys? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1390,141 +1395,141 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Por favor selecione o tipo de chave desejado:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Op��o inv�lida.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "algoritmo de compress�o desconhecido"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "sair deste menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "Nenhuma ajuda dispon�vel"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "muda a data de validade"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "muda os valores de confian�a"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "gerar um novo par de chaves"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1532,7 +1537,7 @@ msgstr "Comando inv
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
@@ -1842,39 +1847,39 @@ msgstr "usando chave secund
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[arquivo]|fazer uma assinatura em texto puro"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "fazer uma assinatura separada"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "criptografar dados"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr ""
 "criptografar apenas com criptografia\n"
 "sim�trica"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "descriptografar dados (padr�o)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verificar uma assinatura"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "listar as chaves"
 
@@ -1887,11 +1892,11 @@ msgstr "listar as chaves e as assinaturas"
 msgid "list and check key signatures"
 msgstr "verificar as assinaturas das chaves"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "listar as chaves e as impress�es digitais"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "listar as chaves secretas"
 
@@ -1899,7 +1904,7 @@ msgstr "listar as chaves secretas"
 msgid "generate a new key pair"
 msgstr "gerar um novo par de chaves"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 #, fuzzy
 msgid "remove keys from the public keyring"
 msgstr "remover a chave do chaveiro p�blico"
@@ -1929,11 +1934,11 @@ msgstr "gerar um certificado de revoga
 msgid "export keys"
 msgstr "exportar chaves"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exportar chaves para um servidor"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importar chaves de um servidor"
 
@@ -1972,20 +1977,20 @@ msgstr "atualizar o banco de dados de confiabilidade"
 msgid "print message digests"
 msgstr "imprime todos os \"digests\" de mensagens"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NOME|criptografar para NOME"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
@@ -2003,12 +2008,12 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "usar modo de texto can�nico"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "n�o fazer altera��es"
 
@@ -2020,13 +2025,13 @@ msgstr ""
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
 msgstr ""
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2064,7 +2069,7 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2093,7 +2098,7 @@ msgstr "Coment
 msgid "usage: gpg [options] "
 msgstr "uso: gpg [op��es] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "comandos conflitantes\n"
 
@@ -2169,472 +2174,472 @@ msgstr "%s: novo arquivo de op
 msgid "unknown configuration item `%s'\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, 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:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 #, 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:3161
+#: g10/gpg.c:3156
 #, 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, 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:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, 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:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2649,7 +2654,7 @@ msgstr "Deletar esta chave do chaveiro? "
 msgid "make timestamp conflicts only a warning"
 msgstr "conflito de \"timestamp\""
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr ""
 "|DA|escrever informa��es de estado para o\n"
@@ -3443,21 +3448,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "chave secreta n�o dispon�vel"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3474,7 +3479,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -4278,12 +4283,12 @@ msgid "writing key binding signature\n"
 msgstr "escrevendo assinatura ligada a uma chave\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, fuzzy, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "O tamanho de chave pedido � %u bits\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
@@ -4354,76 +4359,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA e ElGamal (padr�o)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA e ElGamal (padr�o)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) ElGamal (apenas criptografia)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (apenas criptografia)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, fuzzy, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) DSA (apenas assinatura)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:1667
 #, fuzzy, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) ElGamal (apenas criptografia)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) ElGamal (apenas criptografia)\n"
 
-#: g10/keygen.c:1731
-#, fuzzy, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "O par de chaves DSA ter� 1024 bits.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Que tamanho de chave voc� quer? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4439,7 +4449,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -4456,40 +4466,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4497,12 +4507,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4513,7 +4523,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4530,44 +4540,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 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:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4578,7 +4588,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4593,24 +4603,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 #, 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4618,12 +4628,19 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Por favor digite a frase secreta"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4635,7 +4652,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4647,50 +4664,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4699,12 +4716,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4712,7 +4729,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4720,26 +4737,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -5280,67 +5297,67 @@ msgstr "assinatura %s de: %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "NOTA: algoritmo de criptografia %d n�o encontrado nas prefer�ncias\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr ""
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, fuzzy, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr ""
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 #, fuzzy
 msgid "Uncompressed"
 msgstr "n�o processado(s)"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "n�o processado(s)"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr ""
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
@@ -5383,26 +5400,26 @@ msgstr "%s: novo arquivo de op
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5416,26 +5433,21 @@ msgstr ""
 "usu�rio: \"%.*s\"\n"
 "%u-bit %s chave, ID %08lX, criada %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 #, fuzzy
 msgid "Enter passphrase\n"
 msgstr "Digite a frase secreta: "
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr ""
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "n�o processado(s)"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5445,12 +5457,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "chave de %u-bit/%s, ID %08lX, criada em %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6616,6 +6628,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "n�o processado(s)"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6708,19 +6725,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6769,7 +6786,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
@@ -6789,15 +6806,15 @@ msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6816,150 +6833,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -6976,63 +6992,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "Digite o identificador de usu�rio: "
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NOME|usar NOME como destinat�rio padr�o"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nunca usar o terminal"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "comandos conflitantes\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7139,7 +7155,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7614,147 +7630,147 @@ msgstr "certificado duplicado - removido"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "nenhum endere�o v�lido\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "listar as chaves secretas"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "Certificado de revoga��o v�lido"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "Certificado correto"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "muda a frase secreta"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "criar sa�da com armadura ascii"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "nunca usar o terminal"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "modo n�o-interativo: nunca perguntar"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "assumir sim para a maioria das perguntas"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "assumir n�o para a maioria das perguntas"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "adicionar este chaveiro � lista de chaveiros"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NOME|usar NOME como chave secreta padr�o"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|ENDERE�O|usar este servidor para buscar chaves"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NOME|usar algoritmo de criptografia NOME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NOME|usar algoritmo de \"digest\" de mensagens NOME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Uso: gpgm [op��es] [arquivos] (-h para ajuda)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7765,60 +7781,56 @@ msgstr ""
 "assina, verifica, criptografa ou descriptografa\n"
 "a opera��o padr�o depende dos dados de entrada\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "Uso: gpgm [op��es] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "destinat�rio padr�o desconhecido `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7993,7 +8005,7 @@ msgid "This is a qualified signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
 # INICIO MENU
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "sair"
@@ -8231,78 +8243,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "usar como arquivo de sa�da"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "uso: gpg [op��es] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "chave p�blica n�o encontrada"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "escrevendo certificado privado para `%s'\n"
@@ -8488,12 +8500,12 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-#~ msgid "Repeat passphrase\n"
-#~ msgstr "Repita a frase secreta: "
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "O par de chaves DSA ter� 1024 bits.\n"
 
 #, fuzzy
-#~ msgid "[none]"
-#~ msgstr "vers�o desconhecida"
+#~ msgid "Repeat passphrase\n"
+#~ msgstr "Repita a frase secreta: "
 
 #, fuzzy
 #~ msgid "read options from file"
diff --git a/po/ro.po b/po/ro.po
index 435fd8008..0274e6cb5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -23,13 +23,30 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,58 +54,41 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -98,80 +98,80 @@ msgstr "fraz
 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nu am g�sit nici un inel de chei secret de scris: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: am e�uat s� creez hashtable: %s\n"
@@ -309,7 +309,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -320,262 +320,262 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr "Raporta�i bug-uri la <gnupg-bugs@gnu.org>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -592,8 +592,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -601,8 +601,8 @@ msgstr ""
 "@Comenzi:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -613,36 +613,36 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -650,57 +650,57 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "eroare �n `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "eroare citire �n `%s': %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -712,19 +712,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -736,7 +736,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -746,11 +746,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -816,40 +816,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "eroare la creearea `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[ID utilizator nu a fost g�sit]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nu m� pot conecta la `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "probleme de comunicare cu gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
@@ -1086,6 +1086,11 @@ msgstr "Nici un disponibil disponibil pentru `%s'"
 msgid "ignoring garbage line"
 msgstr "eroare linia de trailer\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[nesetat(�)]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1195,7 +1200,7 @@ msgstr "AVERTISMENT: am g
 msgid "not human readable"
 msgstr "ilizibil"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "cardul OpenPGP nu e disponibil: %s\n"
@@ -1205,8 +1210,8 @@ msgstr "cardul OpenPGP nu e disponibil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1215,158 +1220,158 @@ msgstr "nu pot face acest lucru 
 msgid "This command is only available for version 2 cards\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Selec�ia d-voastr�? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[nesetat(�)]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "masculin"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "feminin"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "nespecificat(�)"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "nefor�at(�)"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "for�at(�)"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Eroare: Deocamdat� sunt permise numai caractere ASCII.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Eroare: Caracterul \"<\" nu poate fi folosit.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Eroare: Spa�iile duble nu sunt permise.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Numele de familie al proprietarului cardului: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Prenumele proprietarului cardului: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Eroare: Nume combinat prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL pentru a aduce cheia public�: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Eroare: URL prea lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "eroare la crearea inelului de chei `%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Date login (nume cont): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Eroare: datele de login prea lungi (limita este de %d caractere).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Date DO personale: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Eroare DO personal pre lung (limita este de %d caractere).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Preferin�e limb�: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Eroare: lungime invalid� pentru �ir preferin�e.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Eroare: caractere invalide �n �ir preferin�e.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Sex ((M)asculin, (F)eminin sau spa�iu): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Eroare: r�spuns invalid.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "Amprenta CA: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Eroare: amprent� formatat� invalid.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "opera�ia pe cheie nu e posibil�: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "nu este un card OpenPGP"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "�nlocuiesc cheia existent�? (d/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Creez copie de rezerv� a cheii de cifrare �n afara cardului? (d/N) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "�nlocuiesc cheile existente? (d/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1377,124 +1382,124 @@ msgstr ""
 "   PIN = `%s'     PIN Admin = `%s'\n"
 "Ar trebui s� le schimba�i folosind comanda --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "V� rug�m selecta�i tipul de cheie de generat:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Cheie de semnare\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Cheie de cifrare\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Cheie de autentificare\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Selec�ie invalid�.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "V� rug�m selecta�i unde s� fie stocat� cheia:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "algoritm de protec�ie a cheii necunoscut\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "p�r�i secrete ale cheii nu sunt disponibile\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "cheia secret� deja stocat� pe un card\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "afi�eaz� toate datele disponibile"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "schimb� numele purt�torului cardului"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "schimb� URL-ul de unde s� fie adus� cheia"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "adu cheia specificat� de URL-ul de pe card"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "schimb� numele de login"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "schimb� preferin�ele de limb�"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "schimb� sexul purt�torului cardului"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "schimb� o amprent� CA"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "comut� fanionul PIN de for�are a semn�turii"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "genereaz� noi chei"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "meniu pentru a schimba sau debloca PIN-ul"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "verific� PIN-ul �i listeaz� toate datele"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Comand�> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "Comand� numai-administrare\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -1502,7 +1507,7 @@ msgstr "Comand
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
@@ -1814,37 +1819,37 @@ msgstr "folosim subcheia %s 
 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fi�ier]|creaz� o semn�tur�"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fi�ier]|creaz� o semn�tur� text �n clar"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "creaz� o semn�tur� deta�at�"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "cifreaz� datele"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "cifreaz� numai cu cifru simetric"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "decripteaz� datele (implicit)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verific� o semn�tur�"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "enumer� chei"
 
@@ -1856,11 +1861,11 @@ msgstr "enumer
 msgid "list and check key signatures"
 msgstr "enumer� �i verific� semn�turile cheii"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "enumer� chei �i amprente"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "enumer� chei secrete"
 
@@ -1868,7 +1873,7 @@ msgstr "enumer
 msgid "generate a new key pair"
 msgstr "genereaz� o nou� perechi de chei"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "�terge chei de pe inelul de chei public"
 
@@ -1896,11 +1901,11 @@ msgstr "genereaz
 msgid "export keys"
 msgstr "export� chei"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "export� chei pentru un server de chei"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "import� chei de la un server de chei"
 
@@ -1937,20 +1942,20 @@ msgstr "actualizeaz
 msgid "print message digests"
 msgstr "|algo [fi�iere]|afi�eaz� rezumate mesaje"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NUME|cifrare pentru NUME"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "folose�te acest id-utilizator pentru a semna sau decripta"
@@ -1964,12 +1969,12 @@ msgstr "|N|seteaz
 msgid "use canonical text mode"
 msgstr "folose�te modul text canonic"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "nu face nici o schimbare"
 
@@ -1981,7 +1986,7 @@ msgstr "
 msgid "use strict OpenPGP behavior"
 msgstr "folose�te comportament strict OpenPGP"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1989,7 +1994,7 @@ msgstr ""
 "@\n"
 "(Arat� pagina man pentru o list� complet� a comenzilor �i op�iunilor)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2027,7 +2032,7 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2055,7 +2060,7 @@ msgstr "Compresie: "
 msgid "usage: gpg [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "comenzi �n conflict\n"
 
@@ -2147,459 +2152,459 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, fuzzy
 msgid "show all notations during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, 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:1673
+#: g10/gpg.c:1672
 #, fuzzy
 msgid "show expiration dates during signature listings"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2612,7 +2617,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:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|scrie informa�ii de stare �n acest FD"
 
@@ -3399,19 +3404,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "P�r�i secrete ale cheii primare sunt stacate pe card.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
@@ -3428,7 +3433,7 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
@@ -4198,12 +4203,12 @@ msgid "writing key binding signature\n"
 msgstr "scriu semn�tur� legat� de cheie\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "lungime cheie invalid�; folosesc %u bi�i\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@ -4272,76 +4277,81 @@ msgstr "   (%c) Comut
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Terminat\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA �i Elgamal (implicit)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA �i Elgamal (implicit)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (numai semnare)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (numai cifrare)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (numai semnare)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (numai cifrare)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (numai cifrare)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (seteaz� singur capabilit��ile)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (seteaz� singur capabilit��ile)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Perechea de chei DSA va avea %u bi�i.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Ce lungime de cheie dori�i? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 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:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4357,7 +4367,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4373,38 +4383,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4412,11 +4422,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4427,7 +4437,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4444,44 +4454,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 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:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4492,7 +4502,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4507,23 +4517,23 @@ msgstr "V
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4531,12 +4541,20 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4547,7 +4565,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:2208
+#: g10/keygen.c:2255
 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"
@@ -4559,50 +4577,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, 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:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4612,12 +4630,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4625,7 +4643,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4633,25 +4651,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, 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:4038
+#: g10/keygen.c:4104
 #, 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"
@@ -5177,66 +5195,66 @@ msgstr "AVERTISMENT: folosesc algoritmul rezumat experimental %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "AVERTISMENT: algoritmul rezumat %s este prea vechi (deprecated)\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "plugin-ul pentru cifrare IDEA nu este prezent\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = arat�-mi mai multe informa�ii\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: op�iune �nvechit� \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "AVERTISMENT: \"%s\" este o op�iune �nvechit�\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "v� rug�m folosi�i \"%s%s\" �n loc\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Necompresat"
 
 #
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "necompresat|niciunul"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "op�iune ambigu� `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
@@ -5279,28 +5297,28 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "AVERTISMENT: op�iunile din %s nu sunt �nc� active �n timpul acestei rul�ri\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5314,25 +5332,20 @@ msgstr ""
 "\"%.*s\"\n"
 "cheia %u-bit %s, ID %s, creat� %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Introduce�i fraza-parol�\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "anulat� de utilizator\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "nefor�at(�)"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5341,12 +5354,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
@@ -6504,6 +6517,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nefor�at(�)"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6596,19 +6614,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, fuzzy, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
@@ -6657,7 +6675,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
@@ -6677,15 +6695,15 @@ msgstr "am e
 msgid "reading public key failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "r�spunsul nu con�ine datele cheii publice\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "r�spunsul nu con�ine modulul RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
@@ -6704,146 +6722,145 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "accesul la comenzile de administrare nu este configurat�\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "eroare la recuperarea st�rii CHV de pe card\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d �ncerc�ri PIN Admin r�mase �nainte de a �ncuia cardul permanent\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "accesul la comenzile de administrare nu este configurat�\n"
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN-ul pentru CHV%d este prea scurt; lungimea minim� este %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "prime-ul RSA %s lipse�te sau nu are %d bi�i\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "v� rug�m a�tepta�i c�t� vreme este creat� noua cheie ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -6860,63 +6877,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NUME|folose�te NUME ca destinatar implicit"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "nu folosi deloc terminalul"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "arat� comenzi administrare"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7024,7 +7041,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "citirea cheii publice a e�uat: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7491,148 +7508,148 @@ msgstr "preferin
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "stergere keyblock a e�uat: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "enumer� chei secrete"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "certificat incorect"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 #, fuzzy
 msgid "register a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "creaz� ie�ire �n armur� ascii"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "nu folosi deloc terminalul"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "modul batch: nu �ntreba niciodat�"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "presupune da la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "presupune nu la cele mai multe �ntreb�ri"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "adaug� acest inel de chei la lista inelelor de chei"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NUME|folose�te NUME ca cheie secret� implicit�"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|HOST|folose�te acest server de chei pentru a c�uta chei"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NUME|folose�te algoritm cifrare NUME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NUME|folose�te algoritm rezumat mesaj NUME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7643,61 +7660,57 @@ msgstr ""
 "sign, check, encrypt sau decrypt\n"
 "opera�iunea implicit� depinde de datele de intrare\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "op�iune necunoscut� `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(Nici o descriere dat�)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = s�ri peste cheia asta\n"
 
 #
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7871,7 +7884,7 @@ msgstr "                aka \"%s\""
 msgid "This is a qualified signature\n"
 msgstr "Aceasta va fi o auto-semn�tur�.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "termin�"
@@ -8107,78 +8120,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "articol configurare necunoscut `%s'\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "folose�te ca fi�ier ie�ire"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "folosire: gpg [op�iuni] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "cheia public� nu a fost g�sit�"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "Nu sunt permise comenzi administrare\n"
@@ -8364,6 +8377,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Perechea de chei DSA va avea %u bi�i.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Repeta�i fraza-parol�\n"
 
@@ -8374,10 +8390,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|PIN Admin"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[nesetat(�)]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "citesc op�iuni din `%s'\n"
diff --git a/po/ru.po b/po/ru.po
index 502ff938e..17898bb3f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GnuPG 2.0.10\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-12-21 00:40+0200\n"
 "Last-Translator: Maxim Britov <maxim.britov@gmail.com>\n"
 "Language-Team: Russian <gnupg-ru@gnupg.org>\n"
@@ -22,66 +22,66 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:597
-msgid ""
-"Please enter your PIN, so that the secret key can be unlocked for this "
-"session"
-msgstr "Введите PIN-код для получения доступа к закрытому ключу"
-
-#: agent/call-pinentry.c:600
-msgid ""
-"Please enter your passphrase, so that the secret key can be unlocked for "
-"this session"
-msgstr "Введите фразу-пароль для получения доступа к закрытому ключу"
-
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
 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:658
+#. 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:606
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойкость введенного выше текста. Можете прокосультироваться у Вашего "
 "администратора о критериях оценки стойкости."
 
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:650
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr "Введите PIN-код для получения доступа к закрытому ключу"
+
+#: agent/call-pinentry.c:653
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "Введите фразу-пароль для получения доступа к закрытому ключу"
+
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -90,66 +90,66 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "не могу создать `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "ошибка получения серийного номера карты: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "обнаружена карта, серийный номер: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "ошибка получения аутентификационного keyID по умолчанию карты: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "в карте не обнаружен пригодный ключ: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "сбой записи ключа: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Введите фразу-пароль для ssh ключа%0A  %c"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -158,12 +158,12 @@ msgstr ""
 "Введите фразу-пароль для защиты принятого закрытого ключа%%0A   %s%%0Aвнутри "
 "хранилища ключей gpg-agent"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "сбой создания потока из сокета: %s\n"
@@ -310,7 +310,7 @@ msgstr "Введите фразу-пароль%0Aдля защиты новог
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -319,109 +319,109 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние окружения и в файл"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "О найденных ошибках сообщайте <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -429,144 +429,144 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s слишком устарело (требуется %s, имеется %s)\n"
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "ошибка создания `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "имя сокета `%s' слишком длинное\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -585,8 +585,8 @@ msgstr ""
 "Синтаксис: gpg-preset-passphrase [параметры] KEYGRIP\n"
 "Кеширование паролей\n"
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -594,8 +594,8 @@ msgstr ""
 "@Команды:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -606,11 +606,11 @@ msgstr ""
 "Параметры:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Использование: gpg-protect-tool [параметры] (-h для подсказки)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -618,21 +618,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -640,55 +640,55 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "отменено\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "ошибка открытия `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "файл `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "системный список доверий `%s' не доступен\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "недопустимый отпечаток в `%s', строка %d\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "ошибка чтения `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
 
@@ -700,7 +700,7 @@ msgstr "ошибка чтения списка доверяемых корнев
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -709,11 +709,11 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "Нет"
 
@@ -725,7 +725,7 @@ msgstr "Нет"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -737,11 +737,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "Подтверждаю"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -809,37 +809,37 @@ msgstr "ошибка запуска `%s': позможно не установл
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr ""
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "хост не найден"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent недоступен в данной сессии\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "не могу подключиться к `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "проблема связи с gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "проблема задания параметров gpg-agent\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "прервано пользователем\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "проблема с агентом\n"
 
@@ -1058,6 +1058,10 @@ msgstr "Нет справки для `%s'."
 msgid "ignoring garbage line"
 msgstr "игнорируем дефектную строку"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[нет]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1165,7 +1169,7 @@ msgstr "ВНИМАНИЕ: обнаружено недопустимое прим
 msgid "not human readable"
 msgstr "не читаемое человеком"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "Карта OpenPGP недоступна: %s\n"
@@ -1175,8 +1179,8 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
@@ -1184,157 +1188,157 @@ msgstr "невозможно сделать это в пакетном режи
 msgid "This command is only available for version 2 cards\n"
 msgstr "Данная команда допустима только для карт версии 2\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code не задан или недоступен\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Ваш выбор (?-подробнее)? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[не установлено]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "мужской"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "женский"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "не задан"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "отключен"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "включен"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Ошибка: Допустим только чистый ASCII.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Ошибка: Нельзя использовать символ \"<\".\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Ошибка: Двойные пробелы недопустимы.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Фамилия владельца карты:"
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Имя владельца карты:"
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Ошибка: Скомбинированное имя слишком длинное (предел %d символов).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "URL для получения открытого ключа: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Ошибка: URL слишком длинный (предел - %d символов).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "ошибка распределения памяти: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "ошибка чтения `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Учетная запись (имя):"
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Ошибка: Данные учетной записи слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Секретные DO данные:"
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Ошибка: Секретные DO данные слишком длинные (предел %d символов).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Предпочитаемый язык: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Ошибка: недопустимая длина строки предпочтений.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Ошибка: недопустимые символы в строке предпочтений.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Пол ((M)Мужской, (F)Женский или пробел): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Ошибка: недопустимый ответ.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "отпечаток CA: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Ошибка: неправильный формат отпечатка.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "операция с ключом невозможна: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "карта не OpenPGP"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "ошибка при считывании информации ключа: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Заменить существующий ключ? (y/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Сделать резервную копию ключа шифрования вне карты? (Y/n)"
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Заменить существующие ключи? (y/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1345,124 +1349,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Следует изменить их используя команду --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Выберите тип создаваемого ключа:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Ключ подписи\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Ключ шифрования\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Ключ аутентификации\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Неправильный выбор.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Выберите, где сохранить ключ:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "неизвестный алгоритм защиты ключа\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "секретные части ключа недоступны\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "секретный ключ уже сохранен в карте\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "показать данную справку"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "вывести все доступные данные"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "изменить имя владельца карты"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "изменить URL получения ключа"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "запросить ключ, указанный по заданному картой URL"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "изменить учетное имя"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "изменить языковые предпочтения"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "изменение пола владельца карты"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "сменить отпечаток CA"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "сгенерировать новые ключи"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "меню изменения или разблокировки PIN"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "проверить PIN и показать все данные"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr "разблокировать PIN используя Reset Code"
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Команда> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "Команды администратора\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Команды администрирования разрешены\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -1470,7 +1474,7 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
@@ -1772,35 +1776,35 @@ msgstr "использую подклключ %s вместо главного 
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 msgid "make a signature"
 msgstr "создать подпись"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 msgid "make a clear text signature"
 msgstr "создать прозрачную подпись"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "создать отделенную подпись"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "зашифровать данные"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "зашифровать только симметричным шифром"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "расшифровать данные (по умолчанию)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "проверить подпись"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "вывести список ключей"
 
@@ -1812,11 +1816,11 @@ msgstr "вывести список ключей и подписи"
 msgid "list and check key signatures"
 msgstr "вывести и проверить подписи"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "вывести список ключей c отпечатками"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "вывести список секретных ключей"
 
@@ -1824,7 +1828,7 @@ msgstr "вывести список секретных ключей"
 msgid "generate a new key pair"
 msgstr "создать новую пару ключей"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "удалить ключи из таблицы открытых ключей"
 
@@ -1852,11 +1856,11 @@ msgstr "создать сертификат отзыва"
 msgid "export keys"
 msgstr "экспортировать ключи"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "экспортировать ключи на сервер ключей"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "импортировать ключи с сервера ключей"
 
@@ -1892,19 +1896,19 @@ msgstr "обновить таблицу доверий"
 msgid "print message digests"
 msgstr "вывести хэши файлов"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|зашифровать для USER-ID"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|использовать USER-ID для подписывания и расшифрования"
 
@@ -1916,11 +1920,11 @@ msgstr "|N|установить уровень сжатия N (0 без сжат
 msgid "use canonical text mode"
 msgstr "использовать канонический текстовый режим"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "не делать никаких изменений"
 
@@ -1932,7 +1936,7 @@ msgstr "спросить перед перезаписью"
 msgid "use strict OpenPGP behavior"
 msgstr "строго следовать стандарту OpenPGP"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1940,7 +1944,7 @@ msgstr ""
 "@\n"
 "(См. документацию для более полного ознакомления с командами и параметрами)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1978,7 +1982,7 @@ msgstr ""
 "Подписи и их проверка, зашифрование и расшифрование.\n"
 "Действие по умолчанию зависит от входных данных.\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2006,7 +2010,7 @@ msgstr "  алгоритмы сжатия: "
 msgid "usage: gpg [options] "
 msgstr "использование: gpg [параметры] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "несовместимые команды\n"
 
@@ -2091,448 +2095,448 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "неизвестный параметр в файле конфигурации `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "отображать Фото ID при распечатке ключей"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "показывать ссылку на политики при распечатке подписей"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "показывать все примечания при распечатке подписей"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "показывать стандартные IETF примечания при распечатке подписей"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 "показывать добавленные пользователем примечания при распечатке подписей"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "показывать предпочитаемый сервер ключей при распечатке подписей"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "показывать действительность Used ID при распечатке ключей"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr "показывать отозванные и просроченные User ID при распечатке ключей"
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "показывать отозванные и просроченные ключи при распечатке ключей"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "печатать имя таблиц ключей при распечатке ключей"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "печатать даты истечения при распечатке подписей"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по умолчанию `%s' проигнорирован\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "отображать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "печатать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "печатать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "печатать стандартные IETF примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "печатать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "печатать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "печатать только главный User ID при проверке подписей"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[имяфайла]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2544,7 +2548,7 @@ msgstr "|FILE|взять ключи из FILE связок ключей"
 msgid "make timestamp conflicts only a warning"
 msgstr "при несоответствии отметки времени - только предупреждением"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|выводить инфромацию в файл с дескриптором FD"
 
@@ -3323,19 +3327,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
@@ -3352,7 +3356,7 @@ msgstr ""
 "Введите новую фразу-пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
 
@@ -4100,12 +4104,12 @@ msgid "writing key binding signature\n"
 msgstr "сохраняем объединяющую подпись\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "неверный размер ключа; используется %u бит\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
@@ -4176,76 +4180,81 @@ msgstr "   (%c) Переключить возможность использов
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Завершено\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "Выберите требуемый тип ключа:\n"
 
-#: g10/keygen.c:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA и ElGamal (по умолчанию)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (только для подписи)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (с требуемыми возможностями)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (только для шифрования)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (только для подписи)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (только для шифрования)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (только для шифрования)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (с требуемыми возможностями)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (с требуемыми возможностями)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "ключи %s могут иметь длину от %u до %u бит.\n"
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Какой размер ключа необходим? (%u) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Какой размер ключа необходим? (%u) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "Запрашиваемый размер ключа %u бит\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4261,7 +4270,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4277,38 +4286,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до: %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4316,11 +4325,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, даты не превышающие 2106 будут обработаны корректно.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4334,7 +4343,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4349,44 +4358,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используемая таблица символов: `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4397,7 +4406,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4412,24 +4421,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:2105
+#: g10/keygen.c:2145
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4437,12 +4446,19 @@ msgstr ""
 "Для защиты секретного ключа необходима фраза-пароль.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4454,7 +4470,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4467,50 +4483,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4518,44 +4534,44 @@ msgstr ""
 "Учтите, данный ключ не может использоваться для шифрования.  Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -5078,66 +5094,66 @@ msgstr "ВНИМАНИЕ: используется эксперименталь
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "ВНИМАНИЕ: хеш-функция %s считается устаревшей\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "модуль поддержки шифра IDEA не обнаружен\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "для дополнительной информации см. %s\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: не рекомендуемая опция \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "ВНИМАНИЕ: \"%s\" не рекомендуемая опция\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "используйте \"%s%s\" взамен\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr ""
 "ВНИМАНИЕ: команда \"%s\" является устаревшей - не следует применять ее\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "ВНИМАНИЕ: \"%s\" устаревший параметр - он не задействован\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "без сжатия"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr ""
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "данное сообщение может быть не пригодно для %s\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "двусмысленный параметр `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "неизвестный параметр `%s'\n"
@@ -5179,28 +5195,28 @@ msgstr "создан новый файл настроек `%s'\n"
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны при этом запуске\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5214,24 +5230,20 @@ msgstr ""
 "%u-бит %s ключ, ID %s,\n"
 "создан %s%s.\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Введите фразу-пароль\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "прервано пользователем\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-msgid "out of core\n"
-msgstr ""
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5239,12 +5251,12 @@ msgid ""
 msgstr ""
 "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
@@ -6385,6 +6397,10 @@ msgstr "параметр \"%.50s\" не понят\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "команда \"%.50s\" не понята\n"
 
+#: jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr ""
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6477,19 +6493,19 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6538,7 +6554,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
@@ -6558,15 +6574,15 @@ msgstr "сбой сохранения даты создания: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
@@ -6585,145 +6601,144 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Введите PIN%%0A[подписей: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 msgid "||Please enter the PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN для CHV%d слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "доступ к командам управления не настроен\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "осталось %d попыток ввода административного PIN до блокировки карты\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Введите Admin PID на клавиатуре считывателя%%0A[осталось попыток: %d]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "доступ к командам управления не настроен\n"
+
+#: scd/app-openpgp.c:1990
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите Reset Code к карте"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr "|RN| Новый Reset Code"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -6739,52 +6754,52 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|установить уровень отладки в LEVEL"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|сохранять журнал в FILE"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|подключаться к считывателю на порт N"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "не использовать встроенный CCID драйвер"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|отсоединить карту по истечении N секунд неактивности"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "не использовать клавиатуру считывателя"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "позволить использовать управляющие команды"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Использование: scdaemon [параметры] (-h для подсказки)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6792,7 +6807,7 @@ msgstr ""
 "Синтаксис: scdaemon [параметры] [команда [аргументы]]\n"
 "Демон смарткарт для GnuPG\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Используйте параметр `--daemon' для запуска приложения в фоновом режиме\n"
@@ -6898,7 +6913,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr ""
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr ""
 
@@ -7338,135 +7353,135 @@ msgstr "сертификат `%s' удален\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "удаление сертификата \"%s\" неудачно: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "не заданы получатели\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "вывести список внешних ключей"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "вывести список правил сертификатов"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "импорт сертификатов"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "экспорт сертификатов"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "зарегистрировать смарткарту"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "передать команду dirmngr"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "вызываем gpg-protect-tool"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "сменить фразу-пароль"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "вывод в BASE64"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "предполагаем получение в формате PEM"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "предполагаем получение в формате BASE64"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "предполагаем получение в двоичном формате"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "используем системный dirmngr, если доступен"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "не сверять с CRL"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "проверка действительности используя OCSP"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|число включаемых сертификатов"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|взять информацию о политиках из FILE"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "не проверять политики сертификата"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "запросить пропущенных издаталей сертификатов"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "не использовать терминал совсем"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|сохранять журнал режима сервера в FILE"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|сохранять журнал аудита в FILE"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "пакетный режим: ничего не запрашивать"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "предполагать Да на большинство вопросов"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "предполагать Нет на большинство вопросов"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|добавить таблицу ключей в список таблиц ключей"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|использовать USER-ID как секретный ключ по умолчанию"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|использовать данный сервер ключей для поиска ключей"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|использовать алгоритм шифрования NAME"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|использовать хеш-функцию NAME"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Использование: gpgsm [параметры] [файлы] (-h для подсказки)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7477,58 +7492,54 @@ msgstr ""
 "протокол\n"
 "операция по умолчанию зависит от входных данных\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "использование: gpgsm [параметры] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "Замечание: не могу зашифровать для `%s': %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr ""
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: не обрабатываем эту строку\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 msgid "could not parse keyserver\n"
 msgstr ""
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "данная команды всё еще не реализована\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7700,7 +7711,7 @@ msgstr "                aka"
 msgid "This is a qualified signature\n"
 msgstr ""
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr ""
 
@@ -7928,55 +7939,55 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "вывод списка всех компонентов"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|вывод списка параметров"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|изменить параметры"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|проверить параметры"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 msgid "list global configuration file"
 msgstr ""
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "проверить глобальный файл конфигурации"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "вывод в указанный файл"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "применить изменения во время исполнения, если возможно"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Использование: gpgconf [параметры] (-h для подсказки)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7984,19 +7995,19 @@ msgstr ""
 "Синтаксис: gpgconf [параметры]\n"
 "Управляет параметрами конфигурации инструментария GnuPG\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "использование: gpgconf [параметры] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "Требуется однокомпонентный аргумент"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "Компонент не найден"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "Аргументы не разрешены"
 
@@ -8179,6 +8190,12 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "Пара ключей DSA будет иметь длину %u бит.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "данная команды всё еще не реализована\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Повторите ввод фразы-пароля\n"
 
@@ -8187,6 +8204,3 @@ msgstr ""
 
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|Административный PID"
-
-#~ msgid "[none]"
-#~ msgstr "[нет]"
diff --git a/po/sk.po b/po/sk.po
index 3ed79de18..6af8baee7 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <mmajer@econ.umb.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -18,70 +18,70 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -91,79 +91,79 @@ msgstr "nespr
 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor tajn�ch k���ov (secring): %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s: nepodarilo sa vytvori� hashovaciu tabu�ku: %s\n"
@@ -301,7 +301,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -312,264 +312,264 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <gnupg-bugs@gnu.org>.\n"
 "Pripomienky k prekladu <sk-i18n@lists.linux.sk>.\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "datab�za d�very: proced�ra read() (n=%d) zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nem��em vytvori� adres�r: %s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,8 +586,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -595,8 +595,8 @@ msgstr ""
 "@Pr�kazy:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -607,91 +607,91 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "chyba pri ��tan�: %s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -703,19 +703,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -727,7 +727,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -737,11 +737,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -807,40 +807,40 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[User id not found]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "nem��em sa pripoji� k `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "probl�m v komunik�cii s gpg-agentom\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 #, fuzzy
 msgid "problem setting the gpg-agent options\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
@@ -1077,6 +1077,11 @@ msgstr "Pomoc nie je dostupn
 msgid "ignoring garbage line"
 msgstr "chyba v p�ti�ke\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "nezn�me"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1188,7 +1193,7 @@ msgstr "VAROVANIE: n
 msgid "not human readable"
 msgstr "nie je v priamo �itate�nom form�te"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, fuzzy, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "tajn� k��� nie je dostupn�"
@@ -1198,8 +1203,8 @@ msgstr "tajn
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
@@ -1209,170 +1214,170 @@ msgstr "nemo
 msgid "This command is only available for version 2 cards\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "V� v�ber? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr ""
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 #, fuzzy
 msgid "male"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "female"
 msgstr "enable"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 #, fuzzy
 msgid "unspecified"
 msgstr "D�vod nebol �pecifikovan�"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 #, fuzzy
 msgid "not forced"
 msgstr "nespracovan�"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr ""
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr ""
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr ""
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr ""
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr ""
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 #, fuzzy
 msgid "URL to retrieve public key: "
 msgstr "�iadny zodpovedaj�ci verejn� k���: %s\n"
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr ""
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr ""
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr ""
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 #, fuzzy
 msgid "Language preferences: "
 msgstr "aktualizova� predvo�by"
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 #, fuzzy
 msgid "Error: invalid length of preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 #, fuzzy
 msgid "Error: invalid characters in preference string.\n"
 msgstr "neplatn� znak v re�azci s predvo�bami\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr ""
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 #, fuzzy
 msgid "Error: invalid response.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 #, fuzzy
 msgid "CA fingerprint: "
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 #, fuzzy
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "chyba: neplatn� odtla�ok\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, fuzzy, c-format
 msgid "key operation not possible: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 #, fuzzy
 msgid "not an OpenPGP card"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, fuzzy, c-format
 msgid "error getting current key info: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr ""
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr ""
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1380,140 +1385,140 @@ msgid ""
 "You should change them using the command --change-pin\n"
 msgstr ""
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 #, fuzzy
 msgid "Please select the type of key to generate:\n"
 msgstr "Pros�m, vyberte druh k���a, ktor� chcete:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 #, fuzzy
 msgid "   (1) Signature key\n"
 msgstr "Platnos� podpisu vypr�ala %s\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 #, fuzzy
 msgid "   (2) Encryption key\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr ""
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Neplatn� v�ber.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 #, fuzzy
 msgid "Please select where to store the key:\n"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 #, fuzzy
 msgid "unknown key protection algorithm\n"
 msgstr "nezn�my ochrann� algoritmus\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 #, fuzzy
 msgid "secret parts of key are not available\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 #, fuzzy
 msgid "secret key already stored on a card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 #, fuzzy
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 #, fuzzy
 msgid "list all available data"
 msgstr "K��� k dispoz�cii na: "
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr ""
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr ""
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr ""
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 #, fuzzy
 msgid "change the login name"
 msgstr "zmeni� dobu platnosti"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 #, fuzzy
 msgid "change the language preferences"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr ""
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 #, fuzzy
 msgid "change a CA fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr ""
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 #, fuzzy
 msgid "generate new keys"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr ""
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr ""
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Pr�kaz> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 #, fuzzy
 msgid "Admin-only command\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 #, fuzzy
 msgid "Admin commands are allowed\n"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 #, fuzzy
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -1521,7 +1526,7 @@ msgstr "Neplatn
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
@@ -1838,37 +1843,37 @@ msgstr "pou
 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[s�bor]|vytvori� podpis v �itate�nom dokumente"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "vytvori� podpis oddelen� od dokumentu"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "�ifrova� d�ta"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "�ifrovanie len so symetrickou �ifrou"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "de�ifrova� d�ta (implicitne)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "verifikova� podpis"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "vyp�sa� zoznam k���ov"
 
@@ -1881,11 +1886,11 @@ msgstr "vyp
 msgid "list and check key signatures"
 msgstr "skontrolova� podpisy k���ov"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "vyp�sa� zoznam k���ov a fingerprintov"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
@@ -1893,7 +1898,7 @@ msgstr "vyp
 msgid "generate a new key pair"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "odstr�ni� k��� zo s�boru verejn�ch k���ov"
 
@@ -1921,11 +1926,11 @@ msgstr "vytvori
 msgid "export keys"
 msgstr "exportova� k���e"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exportova� k���e na server k���ov"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importova� k���e zo servera k���ov"
 
@@ -1962,20 +1967,20 @@ msgstr "aktualizova
 msgid "print message digests"
 msgstr "|algo [s�bory]|vyp�� hash"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|MENO|�ifrova� pre MENO"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
@@ -1993,12 +1998,12 @@ msgstr ""
 msgid "use canonical text mode"
 msgstr "pou�i� k�nonick� textov� m�d"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "nevykona� �iadne zmeny"
 
@@ -2010,7 +2015,7 @@ msgstr "vy
 msgid "use strict OpenPGP behavior"
 msgstr ""
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2019,7 +2024,7 @@ msgstr ""
 "(Pou�ite manu�lov� str�nky pre kompletn� zoznam v�etk�ch pr�kazov a "
 "mo�nost�)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2059,7 +2064,7 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2087,7 +2092,7 @@ msgstr "Kompresia: "
 msgid "usage: gpg [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "konfliktn� pr�kazy\n"
 
@@ -2166,466 +2171,466 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr ""
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 #, 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:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr ""
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 #, fuzzy
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr ""
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr ""
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr ""
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 #, fuzzy
 msgid "show the keyring name in key listings"
 msgstr "uk� v ktorom s�bore k���ov je vyp�san� k���"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 #, 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:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 #, 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:2619
+#: g10/gpg.c:2623
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 #, 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 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:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2639,7 +2644,7 @@ msgstr "Zmaza
 msgid "make timestamp conflicts only a warning"
 msgstr "konflikt �asov�ho raz�tka"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|zap�sa� inform�cie o stave do tohto FD"
 
@@ -3454,20 +3459,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Tajn� �asti prim�rneho k���a nie s� dostupn�.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
@@ -3484,7 +3489,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
@@ -4283,12 +4288,12 @@ msgid "writing key binding signature\n"
 msgstr "zapisujem \"key-binding\" podpis\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "neplatn� d�ka k���a; pou�ijem %u bitov\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@ -4359,76 +4364,81 @@ msgstr ""
 msgid "   (%c) Finished\n"
 msgstr ""
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
+#: g10/keygen.c:1657
 #, fuzzy, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA a ElGamal (implicitn�)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (len na podpis)\n"
 
-#: g10/keygen.c:1655
-#, fuzzy, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) RSA (len na �ifrovanie)\n"
-
-#: g10/keygen.c:1657
-#, fuzzy, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (len na podpis)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, fuzzy, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, fuzzy, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) RSA (len na �ifrovanie)\n"
+
+#: g10/keygen.c:1672
 #, fuzzy, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (len na �ifrovanie)\n"
 
-#: g10/keygen.c:1731
-#, 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:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr ""
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Ak� ve�kos� k���a si prajete? (1024) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 sm/certreqgen-ui.c:147
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr ""
 
-#: g10/keygen.c:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4444,7 +4454,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:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4460,40 +4470,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:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4501,12 +4511,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:1941
+#: g10/keygen.c:1981
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4517,7 +4527,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 #, fuzzy
 msgid ""
 "\n"
@@ -4534,44 +4544,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4582,7 +4592,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4597,23 +4607,23 @@ msgstr "Do po
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4621,12 +4631,19 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "Pros�m, vlo�te heslo; toto je tajn� veta \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4638,7 +4655,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4650,50 +4667,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, 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:3470
+#: g10/keygen.c:3519
 #, 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:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, 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:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4702,12 +4719,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4715,7 +4732,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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4723,26 +4740,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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, 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"
@@ -5279,66 +5296,66 @@ msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr ""
 "vy�iadan� hashovac� algoritmus %s (%d) nevyhovuje predvo�b�m pr�jemcu\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA modul pre GnuPG nen�jden�\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, fuzzy, c-format
 msgid "please see %s for more information\n"
 msgstr " i = pros�m o viac inform�c�i\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VAROV�N�: pou�itie parametra \"%s\" sa neodpor��a\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "pou�ite namiesto neho \"%s%s\" \n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Nekomprimovan�"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 #, fuzzy
 msgid "uncompressed|none"
 msgstr "Nekomprimovan�"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, fuzzy, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, fuzzy, c-format
 msgid "unknown option `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
@@ -5381,27 +5398,27 @@ msgstr "vytvoren
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5414,25 +5431,20 @@ msgstr ""
 "\"%.*s\"\n"
 "k��� s d�kou %u bitov, typ %s, ID %08lX, vytvoren� %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Vlo�i� heslo\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "zru�en� u��vate�om\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "nespracovan�"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5442,12 +5454,12 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "d�ka %u bitov, typ %s, ID %08lX, vytvoren� %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6619,6 +6631,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nespracovan�"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6713,19 +6730,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr ""
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
@@ -6774,7 +6791,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -6794,15 +6811,15 @@ msgstr "zlyhalo obnovenie vyrovn
 msgid "reading public key failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6821,150 +6838,149 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr ""
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr ""
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr ""
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -6980,63 +6996,63 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr ""
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 #, fuzzy
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 #, fuzzy
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|MENO|pou�i� MENO ako implicitn�ho adres�ta"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 #, fuzzy
 msgid "do not use the internal CCID driver"
 msgstr "v�bec nepou��va� termin�l"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -7144,7 +7160,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 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"
@@ -7608,151 +7624,151 @@ msgstr "duplicita predvo
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "vyp�sa� zoznam tajn�ch k���ov"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "nespr�vny certifik�t"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr ""
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "zmeni� heslo"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "v�bec nepou��va� termin�l"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "d�vkov� re�im: nikdy sa na ni� nep�ta�"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "automaticky odpoveda� �no na v��inu ot�zok"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "automaticky odpoveda� NIE na v��inu ot�zok"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add 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:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|MENO|pou�i MENO ako implicitn� tajn� k���"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 #, fuzzy
 msgid "|SPEC|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:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|ALG|pou�i� �ifrovac� algoritmus ALG"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|ALG|pou�i� hashovac� algoritmus ALG"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7763,60 +7779,56 @@ msgstr ""
 "podp�sa�, overi�, �ifrova� alebo de�ifrova�\n"
 "implicitn� oper�cie z�visia od vstupn�ch d�t\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "nezn�my implicitn� adres�t `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(�iadny popis)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr " s = presko�i� tento k���\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7992,7 +8004,7 @@ msgstr ""
 "\n"
 "Ide o podpis k���a n�m sam�m\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "ukon�i�"
@@ -8227,78 +8239,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "nezn�ma polo�ka konfigur�cie \"%s\"\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "pou�i� ako v�stupn� s�bor"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "pou�itie: gpg [mo�nosti] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "verejn� k��� nen�jden�"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "zapisujem tajn� k��� do `%s'\n"
@@ -8484,13 +8496,13 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#, fuzzy
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "P�r k���ov DSA bude ma� d�ku 1024 bitov.\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Opakova� heslo\n"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "nezn�me"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "��tam mo�nosti z `%s'\n"
diff --git a/po/sv.po b/po/sv.po
index 8e2129c3c..b4abebf17 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: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-07-21 09:04+0200\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -38,34 +38,19 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: agent/call-pinentry.c:597
-msgid ""
-"Please enter your PIN, so that the secret key can be unlocked for this "
-"session"
-msgstr ""
-"Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
-"sessionen"
-
-#: agent/call-pinentry.c:600
-msgid ""
-"Please enter your passphrase, so that the secret key can be unlocked for "
-"this session"
-msgstr ""
-"Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
-
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#. 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:658
+#. 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:606
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -74,37 +59,52 @@ msgstr ""
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:650
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr ""
+"Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
+"sessionen"
+
+#: agent/call-pinentry.c:653
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr ""
+"Ange din lösenfras så att den hemliga nyckeln kan låsas upp för denna session"
+
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -115,66 +115,66 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "kan inte skapa \"%s\": %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "fel när serienumret hämtades från kortet: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "identifierade kort med serienummer: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "fel när nyckel-id för autentisering hämtades från kortet: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "ingen lämplig kortnyckel hittades: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "skuggning av nyckeln misslyckades: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "fel vid skrivning av nyckel: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Ange lösenfrasen för ssh-nyckeln%0A  %c"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -183,12 +183,12 @@ msgstr ""
 "Ange en lösenfras för att skydda den mottagna hemliga nyckeln%%0A   %s%%0Ai  "
 "gpg-agents nyckellager"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "misslyckades med att skapa flöde från uttag: %s\n"
@@ -333,7 +333,7 @@ msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -342,110 +342,110 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -453,145 +453,145 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, 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:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "Fel när \"%s\" skapades: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "namnet på uttaget \"%s\" är för långt\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "en gpg-agent är redan igång - startar inte en till\n"
 
 # Jag har valt att inte översätta nonce. Nonce är data eller information som endast används en gång
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fel vid läsning av nonce på fd %d: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d startad\n"
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh-hanteraren 0x%lx för fd %d avslutad\n"
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 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:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -611,8 +611,8 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -621,8 +621,8 @@ msgstr ""
 " "
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -633,11 +633,11 @@ msgstr ""
 "Flaggor:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Användning: gpg-protect-tool [flaggor] (-h för hjälp)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -645,22 +645,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Ange lösenfrasen för att avskydda PKCS#12-objektet."
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Ange lösenfrasen för att skydda det nya PKCS#12-objektet."
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 "Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -668,55 +668,55 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "avbruten\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "fel vid fråga efter lösenfrasen: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "fel vid öppnandet av \"%s\": %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "fil \"%s\", rad %d: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "uttrycket \"%s\" ignorerat i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "systemets tillitslista \"%s\" är inte tillgänglig\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "felaktigt fingeravtryck i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 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"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -728,7 +728,7 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -737,11 +737,11 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "Nej"
 
@@ -753,7 +753,7 @@ msgstr "Nej"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -765,11 +765,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -839,37 +839,37 @@ msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "fel när uttag skapades: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "värden hittades inte"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "kunde inte få tillgång till GPG-Agent i denna session\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "kan inte ansluta till \"%s\": %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "kommunikationsproblem med gpg-agent\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "inställningsproblem för gpg-agent\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "problem med agenten\n"
 
@@ -1089,6 +1089,10 @@ msgstr "Det finns ingen hjälp tillgänglig för \"%s\"."
 msgid "ignoring garbage line"
 msgstr "ignorerar skräprad"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[ingen]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1201,7 +1205,7 @@ msgstr "VARNING: ogiltig notationsdata hittades\n"
 msgid "not human readable"
 msgstr "inte läsbart"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
@@ -1211,8 +1215,8 @@ msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1221,158 +1225,158 @@ msgstr "kan inte göra detta i satsläge\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Vad väljer du? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[inte inställt]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "man"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "kvinna"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "ej angiven"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "inte tvingad"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "tvingad"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Fel: Endast ren ASCII tillåts för närvarande.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Fel: Tecknet \"<\" får inte användas.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Fel: Dubbla blanksteg tillåts inte.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Kortinnehavarens efternamn: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Kortinnehavarens förnamn: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Fel: Fullständigt namn för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "Url för att hämta publik nyckel: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Fel: URL:en är för lång (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "fel vid allokering av tillräckligt mycket minne: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "fel vid läsning av \"%s\": %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Inloggningsdata (kontonamn): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Fel: Inloggningsdata är för långt (gräns är %d tecken).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Privat DO-data: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Fel: Privat DO för långt (gränsen är %d tecken).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Språkinställningar: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Fel: ogiltig längd på inställningssträngen\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Fel: ogiltiga tecken i inställningssträngen.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Kön ((M)an, Kvinna(F) eller blanksteg): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Fel: ogiltigt svar.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA-fingeravtryck: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Fel: ogiltigt formaterat fingeravtryck.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "nyckelåtgärden är inte möjlig: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "inte ett OpenPGP-kort"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "fel vid hämtning av aktuell nyckelinformation: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Ersätt existerande nyckel? (j/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Skapa säkerhetskopia av krypteringsnyckel utanför kortet? (J/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Ersätt existerande nycklar? (j/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1383,126 +1387,126 @@ msgstr ""
 "   PIN-kod = \"%s\"     Admin PIN-kod = \"%s\"\n"
 "Du bör ändra dem med kommandot --change-pin\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Välj vilken typ av nyckel som ska genereras:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) Signeringsnyckel\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Krypteringsnyckel\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Autentiseringsnyckel\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Ogiltigt val.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Välj var nyckeln ska sparas:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "okänd nyckelskyddsalgoritm\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "hemliga delar av nyckeln är inte tillgängliga.\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "hemlig nyckel redan lagrad på ett kort\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "visa denna hjälp"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "lista allt tillgängligt data"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "ändra kortinnehavarens namn"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "ändra url för att hämta nyckel"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "hämta nyckel som anges i kortets url"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "ändra inloggningsnamnet"
 
 # originalet borde ha ett value
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "ändra språkinställningarna"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "ändra kortinnehavarens kön"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "ändra ett CA-fingeravtryck"
 
 # den låter skum
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "växla flagga för att tvinga signatur-PIN-kod"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "generera nya nycklar"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "meny för att ändra eller avblockera PIN-koden"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "validera PIN-koden och lista allt data"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Kommando> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "Kommandon endast för administratör\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Administrationskommandon tillåts\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
@@ -1511,7 +1515,7 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
@@ -1819,38 +1823,38 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[fil]|skapa en signatur"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[fil]|skapa en klartextsignatur"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "skapa signatur i en separat fil"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "kryptera data"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 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:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "dekryptera data (standard)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "validera en signatur"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "lista nycklar"
 
@@ -1862,11 +1866,11 @@ msgstr "lista nycklar och signaturer"
 msgid "list and check key signatures"
 msgstr "lista och kontrollera nyckelsignaturer"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "lista nycklar och fingeravtryck"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "lista hemliga nycklar"
 
@@ -1874,7 +1878,7 @@ msgstr "lista hemliga nycklar"
 msgid "generate a new key pair"
 msgstr "generera ett nytt nyckelpar"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "ta bort nycklar från den publika nyckelringen"
 
@@ -1902,11 +1906,11 @@ msgstr "generera ett spärrcertifikat"
 msgid "export keys"
 msgstr "exportera nycklar"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "exportera nycklar till en nyckelserver"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "importera nycklar från en nyckelserver"
 
@@ -1943,20 +1947,20 @@ msgstr "uppdatera tillitsdatabasen"
 msgid "print message digests"
 msgstr "|algo [filer]|skriv ut kontrollsummor"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|NAMN|kryptera för NAMN"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "använd denna användaridentitet för att signera eller dekryptera"
@@ -1970,11 +1974,11 @@ msgstr "|N|ställ in komprimeringsnivån till N (0 för att inaktivera)"
 msgid "use canonical text mode"
 msgstr "använd \"ursprunglig text\"-läget"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr "|FIL|skriv utdata till FIL"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "gör inga ändringar"
 
@@ -1988,7 +1992,7 @@ msgstr "använd strikt OpenPGP-beteende"
 
 # inställningar istället för flaggor?
 # Nej, här är det bruksanvisningen för kommandoraden.
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1996,7 +2000,7 @@ msgstr ""
 "@\n"
 "(Se manualsidan för en fullständig lista över alla kommandon och flaggor)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2037,7 +2041,7 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2065,7 +2069,7 @@ msgstr "Komprimering: "
 msgid "usage: gpg [options] "
 msgstr "användning: gpg [flaggor] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "motstridiga kommandon\n"
 
@@ -2151,459 +2155,459 @@ msgstr ""
 msgid "unknown configuration item `%s'\n"
 msgstr "okänd konfigurationspost \"%s\"\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "visa foto-id under nyckellistning"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "visa policy-url:er under signaturlistningar"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "visa alla notationer under signaturlistningar"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "visa IETF-standardnotationer under signaturlistningar"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "visa användarangivna notationer under signaturlistningar"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "visa url:er till föredragna nyckelservrar under signaturlistningar"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "visa giltighet för användaridentitet vid nyckellistningar "
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr "visa spärrade och utgångna användaridentiteter i nyckellistningar"
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "visa spärrade och utgångna undernycklar i nyckellistningar"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "visa nyckelringens namn i nyckellistningar"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "visa utgångsdatum under signaturlistningar"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, 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:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 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:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, 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:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 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:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 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:3153
+#: g10/gpg.c:3148
 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:3155
+#: g10/gpg.c:3150
 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:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 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:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, 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:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2619,7 +2623,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:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|skriv statusinformation till denna FD"
 
@@ -3409,19 +3413,19 @@ msgstr ""
 "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
 "att ändra.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Hemliga delar av den primära nyckeln är lagrade på kortet.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
@@ -3438,7 +3442,7 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
@@ -4209,12 +4213,12 @@ msgid "writing key binding signature\n"
 msgstr "skriver signatur knuten till nyckeln\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "ogiltig nyckelstorlek; använder %u bitar\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -4289,77 +4293,82 @@ msgstr "   (%c) Växla autentiseringsförmågan\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Färdig\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA och Elgamal (standard)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA och Elgamal (standard)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (endast signering)\n"
 
-#: g10/keygen.c:1655
-#, 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:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (endast kryptering)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (endast signering)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (endast kryptering)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (endast kryptering)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, 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:1672
 #, 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:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "Vilken nyckelstorlek vill du ha? (%u) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "Vilken nyckelstorlek vill du ha? (%u) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 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:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4376,7 +4385,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:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4392,38 +4401,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4431,11 +4440,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4450,7 +4459,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4468,44 +4477,44 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4516,7 +4525,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
 
@@ -4532,24 +4541,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4557,12 +4566,20 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Ange lösenfrasen för att skydda det importerade objektet inom GnuPG-systemet."
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4574,7 +4591,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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,51 +4603,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:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 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:3536
+#: g10/keygen.c:3585
 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"
@@ -4639,13 +4656,13 @@ msgstr ""
 "vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
 "syfte.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4653,7 +4670,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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4661,25 +4678,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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
@@ -5210,65 +5227,65 @@ msgstr "VARNING: använder experimentella sammandragsalgoritmen %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "VARNING: sammandragsalgoritmen %s är föråldrad\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "insticksmodul för IDEA-chiffer är inte installerat\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "se %s för mer information\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: flaggan är föråldrad \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "VARNING: inställningen \"%s\" är föråldrad\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "Använd \"%s%s\" istället\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, 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:796
+#: g10/misc.c:787
 #, 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:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Okomprimerad"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "okomprimerad|ingen"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, 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:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "tvetydlig flagga \"%s\"\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "okänd flagga \"%s\"\n"
@@ -5311,26 +5328,26 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "VARNING: inställningar i \"%s\" är ännu inte aktiva under denna körning\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5345,25 +5362,20 @@ msgstr ""
 "%u-bitars %s-nyckel, ID %s,\n"
 "skapad %s%s.\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Ange lösenfrasen\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "avbruten av användaren\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "[Fel - slut på kärna]"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5372,12 +5384,12 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp den hemliga\n"
 "nyckeln för användaren: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
@@ -6565,6 +6577,11 @@ msgstr "flagga \"%.50s\" är tvetydig\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "kommandot \"%.50s\" är tvetydigt\n"
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "[Fel - slut på kärna]"
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6657,19 +6674,19 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modulus saknas eller är inte %d bitar stor\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
@@ -6718,7 +6735,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fel vid hämtning av ny PIN-kod: %s\n"
@@ -6738,15 +6755,15 @@ msgstr "misslyckades med att lagra datum för skapandet: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "läsning av publik nyckel misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "svaret innehåller inte publikt nyckeldata\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "svaret innehåller inte en RSA-modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
@@ -6767,149 +6784,148 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "fel vid hämtning av CHV-status från kort\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d försök för Admin PIN-koden återstår innan kortet låses permanent\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Ange administratörens PIN-kod på läsarens knappsats%%0A[återstående "
 "försök: %d]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "PIN-kod för CHV%d är för kort; minimumlängd är %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA-primtal %s saknas eller inte %d bitar stor\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr "avtrycket på kortet stämmer inte med den begärda\n"
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet har inte stöd för sammandragsalgoritmen %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -6925,53 +6941,53 @@ msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 msgid "|N|Initial New PIN"
 msgstr "|N|Initial PIN-kod"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "kör i multiserverläge (förgrund)"
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|NIVÅ|ställ in felsökningsnivån till NIVÅ"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|anslut till läsare på port N"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAMN|använd NAMN som ct-API-drivrutin"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAMN|använd NAMN som PC/SC-drivrutin"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "använd inte den interna CCID-drivrutinen"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "använd inte läsarens knappsats"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "tillåt användning av administratörskommandon för kort"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Användning: scdaemon [flaggor] (-h för hjälp)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6979,7 +6995,7 @@ msgstr ""
 "Syntax: scdaemon [flaggor] [kommando [argument]]\n"
 "Smartkortsdemon för GnuPG\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "använd flaggan \"--daemon\" för att köra programmet i bakgrunden\n"
 
@@ -7085,7 +7101,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "uppslag av endast-mellanlagrad dirmngr-nyckel misslyckades: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "misslyckades med att allokera keyDB-hanterare\n"
 
@@ -7529,138 +7545,138 @@ msgstr "certifikatet \"%s\" togs bort\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "borttagning av certifikatet \"%s\" misslyckades: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "inga giltiga mottagare angavs\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "lista externa nycklar"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "lista certifikatkedja"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "importera certifikat"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "exportera certifikat"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "registrera ett smartkort"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "skicka ett kommando till dirmngr"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "starta gpg-protect-tool"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "ändra en lösenfras"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "skapa base-64-kodat utdata"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "anta att inmatning är i PEM-format"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "anta att inmatning är i base-64-format"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "anta att inmatning är i binärformat"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "använd systemets dirmngr om tillgängligt"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "kontrollera aldrig mot spärrlista"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "kontrollera giltigheten med OCSP"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|antal certifikat att inkludera"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|FIL|hämta policyinformation från FIL"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "kontrollera inte certifikatpolicier"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "hämta saknade utfärdarcertifikat"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "använd inte terminalen alls"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FIL|skriv en serverlägeslogg till FIL"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FIL|skriv en granskningslogg till FIL"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "satsläge: fråga aldrig"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "anta ja på de flesta frågorna"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "anta nej på de flesta frågorna"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "lägg till denna nyckelring till listan över nyckelringar"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 #, fuzzy
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|NAMN|använd NAMN som förvald hemlig nyckel"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|använd denna nyckelserver för att slå upp nycklar"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAMN|använd chifferalgoritmen NAMN"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAMN|använd sammandragsalgoritmen NAMN"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 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:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7670,58 +7686,54 @@ msgstr ""
 "signera, kontrollera, kryptera eller dekryptera med S/MIME-protokollet\n"
 "standardåtgärden beror på inmatningsdata\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "användning: gpgsm [flaggor] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, 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:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "okänd valideringsmodell \"%s\"\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: inget värdnamn angivet\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: lösenord angivet utan användare\n"
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: hoppar över denna rad\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 msgid "could not parse keyserver\n"
 msgstr "kunde inte tolka nyckelserver\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "det här kommandot har ännu inte implementerats\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
 
@@ -7902,7 +7914,7 @@ msgstr "      även känd som"
 msgid "This is a qualified signature\n"
 msgstr "Det här är en kvalificerad signatur\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "tyst"
 
@@ -8130,55 +8142,55 @@ msgstr "Extern validering av komponenten %s misslyckades"
 msgid "Note that group specifications are ignored\n"
 msgstr "Observera att gruppspecifikationer ignoreras\n"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "lista alla komponenter"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr "kontrollera alla program"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|KOMPONENT|lista flaggor"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|KOMPONENT|ändra flaggor"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr "|KOMPONENT|kontrollera flaggor"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr "tillämpa globala standardvärden"
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr "hämta konfigurationskatalogerna för gpgconf"
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 msgid "list global configuration file"
 msgstr "lista global konfigurationsfil"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "kontrollera global konfigurationsfil"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "använd som fil för utdata"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "aktivera ändringar vid körtid, om möjligt"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Användning: gpgconf [flaggor] (-h för hjälp)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -8186,19 +8198,19 @@ msgstr ""
 "Syntax: gpgconf [flaggor]\n"
 "Hantera konfigurationsinställningar för verktygen i GnuPG-systemet\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "användning: gpgconf [flaggor] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "Behöver ett komponentargument"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "Komponenten hittades inte"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "Inget argument tillåts"
 
@@ -8384,6 +8396,12 @@ msgstr ""
 "Syntax: gpg-check-pattern [flaggor] mönsterfil\n"
 "Kontrollera en lösenfras angiven på standard in mot mönsterfilen\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA-nyckelparet kommer att ha %u bitar.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "det här kommandot har ännu inte implementerats\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Repetera lösenfrasen\n"
 
@@ -8394,9 +8412,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|Admin PIN-kod"
 
-#~ msgid "[none]"
-#~ msgstr "[ingen]"
-
 #~ msgid "read options from file"
 #~ msgstr "läs inställningar från fil"
 
diff --git a/po/tr.po b/po/tr.po
index 6e71a1fc7..7eb3bec09 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-12-14 23:25+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@belgeler.gen.tr>\n"
 "Language-Team: Turkish\n"
@@ -22,7 +22,23 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+msgid "Quality:"
+msgstr "Kalite:"
+
+#. 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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -30,7 +46,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -38,52 +54,36 @@ msgstr ""
 "Lütfen anahtar parolanızı giriniz, böylelikle bu oturumda bu gizli anahtar "
 "kilitsiz olabilecek"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-msgid "Quality:"
-msgstr "Kalite:"
-
-#. 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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -92,66 +92,66 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "\"%s\" oluşturulamıyor: %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "kartın seri numarası alınırken hata: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "Algılanan kartın seri nr: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "kartın öntanımlı kimlik doğrulama anahtar kimliği alınırken hata: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "uygun bir kart anahtarı yok: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "anahtar gölgelenemedi: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "anahtarı yazarken hata: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "Lütfen SSH anahtarı %0A  %c için anahtar parolasını giriniz"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
@@ -160,12 +160,12 @@ msgstr ""
 "gpg-agent'in anahtar deposuna korumak için alınan gizli anahtar %%0A  %s%%0A "
 "için lütfen anahtar parolası giriniz"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "sokette akım oluşturulamadı: %s\n"
@@ -306,7 +306,7 @@ msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı girini
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -315,109 +315,109 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -425,144 +425,144 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s çok eski (gereken %s, sizinki %s)\n"
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 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:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "`%s' oluşturulurken hata: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "soketin ismi `%s' çok uzun\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "çalışan bir gpg-agent zaten var - bir yenisi başlatılmayacak\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "%s için stat() başarısız oldu: %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "tutamak 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "tutamak 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için başlatıldı\n"
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh tutamağı 0x%lx, fd %d için sonlandırıldı\n"
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select başarısız: %s - 1s bekliyor\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -581,8 +581,8 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -590,8 +590,8 @@ msgstr ""
 "@Komutlar:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -602,11 +602,11 @@ msgstr ""
 "Seçenekler:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Kullanımı: gpg-protect-tool [seçenekler] (yardım için -h)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -614,16 +614,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 "PKCS#12 nesnesinin korumasını aşmak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "PKCS#12 nesnesini korumak için lütfen anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -631,7 +631,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -639,55 +639,55 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "iptal edildi\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "'%s' açılırken hata: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 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"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "`%2$s' dosyasının %3$d. satırındaki \"%1$s\" deyimi yoksayıldı\n"
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "sistem güvence listesi `%s' kullanım dışı\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "`%s', %d. satırda parmakizi hatalı\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
@@ -699,7 +699,7 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -708,11 +708,11 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "Hayır"
 
@@ -724,7 +724,7 @@ msgstr "Hayır"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -736,11 +736,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "Doğru"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -808,37 +808,37 @@ msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "soket oluşturulurken hata: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "konak yok"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent bu oturumda kullanılamaz\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "\"%s\" sunucusuna bağlanılamadı: %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "gpg-agent ile haberleşme problemi\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "gpg-agent seçenekleri ayarlanırken sorun çıktı\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "kullanıcı tarafından iptal edildi\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "aracı ile sorun var\n"
 
@@ -1057,6 +1057,10 @@ msgstr "`%s' için yardım mevcut değil."
 msgid "ignoring garbage line"
 msgstr "bozuk satır yok sayılıyor"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[yok]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1164,7 +1168,7 @@ msgstr "UYARI: geçersiz simgelem verisi bulundu\n"
 msgid "not human readable"
 msgstr "insan okuyabilir değil"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
@@ -1174,8 +1178,8 @@ msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 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"
 
@@ -1183,157 +1187,157 @@ msgstr "bu önceden betik kipinde yapılamaz\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "Bu komut sadece 2. sürüm kartlar için kullanılabilir\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "Seçiminiz? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[belirtilmedi]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "erkek"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "dişi"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "belirtilmemiş"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "zorlanmadı"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "zorlandı"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "Hata: Şimdilik sadece US-ASCII mümkün.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "Hata: \"<\" karakteri kullanılmamalı.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "Hata: Çift boşluğa izin verilmez.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "Kart sahibinin soyadı: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "Kart sahibinin adı: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "Hata: İsimler birlikte çok uzun oluyor (sınır: %d karakter).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "genel anahtarın alınacağı URL: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "Hata: URL çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "yeterli bellek ayrılırken hata: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "\"%s\" okunurken hata: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "Oturum açma verisi (hesap adı): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "Hata: Oturum açma verisi çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "Özel DO verisi: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "Hata: Özel DO çok uzun (sınır: %d karakter).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "Dil tercihleri: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "Hata: tercih dizgesinin uzunluğu geçersiz.\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "Hata: tercih dizgesindeki karakterler geçersiz.\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "Cinsiyet ((E)rkek, (D)işi veya boşluk): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "Hata: yanıt geçersiz.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA parmak izi: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "Hata: biçimli parmakizi geçersiz\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "anahtar işlemi mümkün değil: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "bir OpenPGP kartı değil"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "geçerli anahtar bilgisi alınırken hata: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "Mevcut anahtar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "Şifreli anahtarın kartsız yedeği yapılsın mı? (E/h ya da Y/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "Mevcut anahtarlar değiştirilsin mi? (e/H ya da y/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1344,124 +1348,124 @@ msgstr ""
 "   PIN = `%s'     Admin PIN = `%s'\n"
 "Bunları --change-pin komutunu kullanarak değiştirmelisiniz\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "Lütfen üretilecek anahtar türünü seçiniz:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) İmzalama anahtarı\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) Şifreleme anahtarı\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) Kimlik kanıtlama anahtarı\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "Seçim geçersiz.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "Lütfen anahtarın saklanacağı yeri seçiniz:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "bilinmeyen anahtar koruma algoritması\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "anahtarın gizli parçaları kullanılabilir değil\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "bunu gösterir"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "tüm kullanılabilir veriyi listeler"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "kart sahibinin ismini değiştirir"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "anahtarın alınacağı URL değiştirilir"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "kart URL'sinde belirtilmiş anahtarı alır"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "oturum açma ismini değiştirir"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "dil tercihlerini değiştirir"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "kart sahibinin cinsiyetini değiştirir"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "bir CA parmakizini değiştirir"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "imza zorlama PIN'i bayrağını değiştirir"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "yeni anahtarlar üretir"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "PIN'i değiştirme veya engelleme menüsü"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "PIN'i doğrular ve tüm veriyi listeler"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr "Bir Sıfırlama Kodu kullanarak PIN'in engelini kaldır"
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "Komut> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "Yöneticiye özel komut\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "Yönetici komutlarına izin verilir\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -1469,7 +1473,7 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
@@ -1776,35 +1780,35 @@ 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:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 msgid "make a signature"
 msgstr "bir imza yapar"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 msgid "make a clear text signature"
 msgstr "açıkça okunabilen bir imza yapar"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "bağımsız bir imza yapar"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "veriyi şifreler"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "sadece simetrik şifre ile şifreler"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "veri şifresini açar (öntanımlı)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "bir imzayı doğrular"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "anahtarları listeler"
 
@@ -1816,11 +1820,11 @@ msgstr "anahtarları ve imzaları listeler"
 msgid "list and check key signatures"
 msgstr "anahtar imzalarını listeler ve sınar"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "anahtarları ve parmak izlerini listeler"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "gizli anahtarları listeler"
 
@@ -1828,7 +1832,7 @@ msgstr "gizli anahtarları listeler"
 msgid "generate a new key pair"
 msgstr "yeni bir anahtar çifti üretir"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "anahtarları genel anahtar zincirinden siler"
 
@@ -1856,11 +1860,11 @@ msgstr "bir yürürlükten kaldırma sertifikası üretir"
 msgid "export keys"
 msgstr "anahtarları gönderir"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "anahtarları bir anahtar sunucusuna gönderir"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "anahtarları bir anahtar sunucusundan indirir"
 
@@ -1896,19 +1900,19 @@ msgstr "güvence veritabanını günceller"
 msgid "print message digests"
 msgstr "ileti özetlerini gösterir"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|KULLANICI-KİMLİĞİ|KULLANICI-KİMLİĞİ için şifreleme yapar"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|imzalamak ya da şifre çözmek için KULLANICI-KİMLİĞİ "
@@ -1922,11 +1926,11 @@ msgstr "|N|sıkıştırma seviyesi N olarak ayarlanır (0 iptal eder)"
 msgid "use canonical text mode"
 msgstr "kurallı metin kipini kullanır"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr "|DOSYA|çıktı DOSYAya yazılır"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "hiçbir değişiklik yapmaz"
 
@@ -1938,7 +1942,7 @@ msgstr "üzerine yazmadan önce sorar"
 msgid "use strict OpenPGP behavior"
 msgstr "kesin OpenPGP davranışı etkin olur"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1946,7 +1950,7 @@ msgstr ""
 "@\n"
 "(Tüm komut ve seçeneklerin komple listesi için man sayfalarına bakın)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1986,7 +1990,7 @@ msgstr ""
 "imzalama, kontrol, şifreleme veya çözme\n"
 "öntanımlı işlem girilen veriye bağımlıdır\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2014,7 +2018,7 @@ msgstr "Sıkıştırma: "
 msgid "usage: gpg [options] "
 msgstr "kullanımı: gpg [seçenekler] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "çelişen komutlar\n"
 
@@ -2090,453 +2094,453 @@ msgstr "UYARI: '%s' eklentisini içeren dizinin izinleri güvensiz\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "yapılandırma öğesi '%s' bilinmiyor\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "anahtarların listelenmesi sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "imza listelemesi sırasında poliçe URLleri gösterilir"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "imza listelemesi sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "imza listelemesi sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "imza listelemesi sırasında kullanıcı kanaklı simgelemleri gösterir"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr ""
 "imza listelemesi sırasında tercih edilen anahtar sunucusu adresi gösterilir"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 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:1667
+#: g10/gpg.c:1666
 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:1669
+#: g10/gpg.c:1668
 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:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "anahtar zinciri ismini anahtar listelerinde gösterir"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "imza listelemesi sırasında zamanaşımı tarihleri gösterilir"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, 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:1926
+#: g10/gpg.c:1925
 #, 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:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, 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:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, 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:2584
+#: g10/gpg.c:2588
 #, 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:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 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:2674
+#: g10/gpg.c:2678
 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:2676
+#: g10/gpg.c:2680
 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:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 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:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, 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:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, 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:3029
+#: g10/gpg.c:3024
 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:3035
+#: g10/gpg.c:3030
 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:3041
+#: g10/gpg.c:3036
 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:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 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:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 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:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 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:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, 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:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, 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:3365
+#: g10/gpg.c:3363
 #, 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:3376
+#: g10/gpg.c:3374
 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:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, 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:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 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:3434
+#: g10/gpg.c:3432
 #, 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:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 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:3485
+#: g10/gpg.c:3483
 #, 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:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, 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:3666
+#: g10/gpg.c:3664
 #, 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:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2548,7 +2552,7 @@ msgstr "|DOSYA|anahtarlar DOSYA anahtar zincirinden alınır"
 msgid "make timestamp conflicts only a warning"
 msgstr "zaman damgası çelişkilerini uyarı olarak bildirir"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|durum bilgisini bu FD'ye yazar"
 
@@ -3343,19 +3347,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 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:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Asıl anahtarın gizli parçaları kart üzerinde saklı.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
@@ -3372,7 +3376,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -4168,12 +4172,12 @@ msgid "writing key binding signature\n"
 msgstr "anahtarı garantileyen imzayı yazıyor\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "anahtar uzunluğu geçersiz; %u bit kullanılıyor\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4244,76 +4248,81 @@ msgstr "   (%c) Kimlik kanıtlama yeteneğini açar/kapar\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) Bitti\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 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:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "  (%d) DSA ve ElGamal (öntanımlı)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (yalnız imzalamak için)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (sadece imzalamak için)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (yalnız şifrelemek için)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (sadece şifrelemek için)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (yeteneklerini belirtin)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (yeteneklerini belirtin)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA anahtar çifti %u bit olacak.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, 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:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "İstediğiniz anahtar uzunluğu nedir? (%u) "
+
+#: g10/keygen.c:1791 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:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 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:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4329,7 +4338,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4345,38 +4354,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4384,11 +4393,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:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4403,7 +4412,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4419,44 +4428,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 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:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4467,7 +4476,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 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"
@@ -4483,24 +4492,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 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:2105
+#: g10/keygen.c:2145
 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:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4508,12 +4517,21 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr ""
+"Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
+"giriniz."
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4525,7 +4543,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4538,50 +4556,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, 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:3498
+#: g10/keygen.c:3547
 #, 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:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4589,19 +4607,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:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4609,26 +4627,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 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:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, 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:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -5150,65 +5168,65 @@ msgstr "UYARI: deneysel %s özet algoritması kullanılıyor\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "UYARI: %s özet algoritması artık önerilmiyor.\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA şifre eklentisi yok\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, 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:770
+#: g10/misc.c:761
 #, 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:774
+#: g10/misc.c:765
 #, 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:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "lütfen yerine \"%s%s\" kullanınız\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, 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:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: eskimiş seçenek \"%s\" - artık etkisiz\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "UYARI: \"%s\" seçeneği eskidi - artık etkisiz\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "Sıkıştırılmamış"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "Sıkıştırılmamış|yok"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "bu ileti %s tarafından kullanılamayabilir\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "`%s' seçeneği belirsiz\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "`%s' seçeneği bilinmiyor\n"
@@ -5251,26 +5269,26 @@ msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr ""
 "UYARI: `%s' deki seçenekler bu çalıştırma sırasında henüz etkin değil\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5284,24 +5302,20 @@ msgstr ""
 "%u bitlik %s anahtarı, kimlik %s,\n"
 "oluşturma tarihi %s%s.\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "Anahtar parolasını giriniz\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "kullanıcı tarafından durduruldu\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-msgid "out of core\n"
-msgstr "nüve dışında\n"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5310,12 +5324,12 @@ msgstr ""
 "Gizli anahtarın kilidini açmak için bir anahtar parolasına ihtiyacınız var.\n"
 "Anahtarın sahibi: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u bitlik %s anahtarı, %s kimliği ile %s tarihinde üretilmiş"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
@@ -6470,6 +6484,10 @@ msgstr "\"%.50s\" seçeneği belirsiz\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" komutu belirsiz\n"
 
+#: jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "nüve dışında\n"
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6562,19 +6580,19 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
@@ -6623,7 +6641,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
@@ -6643,15 +6661,15 @@ msgstr "oluşturma tarihinin saklanması başarısız oldu: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "genel anahtar okuması başarısız: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "yanıt genel anahtar verisi içermiyor\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "yanıt RSA modülü içermiyor\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
@@ -6672,146 +6690,145 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||Lütfen PIN'i giriniz%%0A[yapılan imza: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 msgid "||Please enter the PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d için PIN çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 
-#: scd/app-openpgp.c:1598
-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:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "karttan CHV durumu alınırken hata\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr ""
 "kart kalıcı olarak kilitlenmeden önce %d Yönetici PIN kalmasına çalışılıyor\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr ""
 "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz%%0A[kalan deneme: %"
 "d]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+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:1990
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Sıfırlama Kodu çok kısa; asgari uzunluk: %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr "|YSK|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|YYP|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA asal sayısı %s ya eksik la da %d bitlik değil\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP kartının yapısı geçersiz (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 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:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -6827,52 +6844,52 @@ msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 msgid "|N|Initial New PIN"
 msgstr "|N|İlk Yeni PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "çoklu sunucu kipinde çalışır (önalanda)"
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LDÜZEY|hata ayıklama düzeyini DÜZEY yapar"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|DOSYA|DOSYAya bir günce yazar"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|N. porttaki okuyucuya bağlanır"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|İSİM|ct-API sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|İSİM|PC/SC sürücüsü olarak İSİM kullanılır"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "dahili CCID sürücüsü kullanılmaz"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|N saniyelik durgunluktan sonra kartı ayırır"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "bir okuyucu tuştakımı kullanılmaz"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "yönetici kartı komutları kullanımına izin verir"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "Kullanımı: scdaemon [seçenekler] (yardım için -h)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6880,7 +6897,7 @@ msgstr ""
 "Sözdizimi: scdaemon [seçenekler] [komut [arg ...]]\n"
 "GnuPG için akıllı kart artalan süreci\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 "Programı artalanda çalışır bırakmak için lütfen `--daemon' seçeneğini "
@@ -6987,7 +7004,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr sadece-önbellek anahtar araması başarısızi: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "ayrılmış anahtar veritabanı elde edilemedi: %s\n"
 
@@ -7429,137 +7446,137 @@ msgstr "sertifika `%s' silindi\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "\"%s\" sertifikası silinemedi: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "geçerli alıcılar verilmedi\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "harici anahtarları listeler"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "sertifika zincirini listeler"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "sertifikaları ithal eder"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "sertifikaları ihraç eder"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "bir akıllı kartı kayda alır"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "dirmngr'a bir komut aktarır"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "gpg-protect-tool'u çalıştırır"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "anahtar parolası değiştirir"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "base-64 kodlu çıktı oluşturur"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "girdinin PEM biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "girdinin base-64 biçiminde olduğu kabul edilir"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "girdinin ikilik biçimde olduğu kabul edilir"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "elverişliyse sistemin dirmngr'ı kullanılır"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "asla bir CRL sormaz"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "doğruluğu OCSP kullarak sınar"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|içerilecek sertifika sayısı"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|DOSYA|poliçe bilgisi DOSYAdan alınır"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "sertifika poliçeleri sınanmaz"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "kayıp sertifikacı sertifikalarını alır"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "terminali hiç kullanma"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|DOSYA|bir sunucu kipi günlüğü DOSYAya yazar"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr "|DOSYA|bir denetim günlüğünü DOSYAya yazar"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "önceden belirlenmiş işlemler kipi: hiç sormaz"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "soruların çoğunda cevap evet farzedilir"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "soruların çoğunda cevap hayır farzedilir"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|DOSYA|anahtar zincirini anahtar zincirleri listesine ekler"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 "|KULLANICI-KİMLİĞİ|öntanımlı gizli anahtar olarak KULLANICI-KİMLİĞİ "
 "kullanılır"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|BELİRTİM|anahtarları aramak için bu anahtar sunucusu kullanılır"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|İSİM|şifre algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|İSİM|özet algoritması olarak İSİM kullanılır"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "Kullanımı: gpgsm [seçenekler] [dosyalar] (yardım için -h)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7569,58 +7586,54 @@ 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:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "kullanımı: gpgsm [seçenekler] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "BİLGİ:`%s'e şifrelenemez: %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "`%s' geçerlilik modeli bilinmiyor\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: konak adı belirtilmemiş\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: kullanıcısız parola verilmiş\n"
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: bu satır atlanıyor\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 msgid "could not parse keyserver\n"
 msgstr "anahtar sunucusu çözümlenemedi\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "bu komut henüz gerçeklenmedi\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
 
@@ -7798,7 +7811,7 @@ msgstr "        nam-ı diğer"
 msgid "This is a qualified signature\n"
 msgstr "Bu bir nitelikli imzadır.\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "sessiz"
 
@@ -8029,55 +8042,55 @@ msgstr "%s bileşeninin harici doğrulaması başarısız oldu"
 msgid "Note that group specifications are ignored\n"
 msgstr "Grup belirtimlerinin yoksayıldığına dikkat edin\n"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "tüm bileşenleri listeler"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr "tüm programları sınar"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|BİLEŞEN|seçenekleri listeler"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|BİLEŞEN|seçenekleri değiştirir"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr "|BİLEŞEN|seçenekleri sınar"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr "öntanımlı küresel değerleri uygular"
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr "gpgconf için yapılandırma dizinlerini getirir"
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 msgid "list global configuration file"
 msgstr "küresel yapılandırma dosyasını listeler"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "küresel yapılandırma dosayasını sınar"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "çıktı dosyası olarak kullanılır"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "mümkünse değişiklikleri çalışma sırasında etkin kılar"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "Kullanımı: gpgconf [seçenekler] (yardım için -h)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -8085,19 +8098,19 @@ msgstr ""
 "Sözdizimi: gpgconf [seçenekler]\n"
 "GnuPG sisteminin araçları için yapılandırma seçeneklerini yönetir\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "kullanımı: gpgconf [seçenekler] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "Tek bileşenlik değiştirge gerekli"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "Bileşen yok"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "Değiştirgeye izin verilmez"
 
@@ -8283,6 +8296,12 @@ msgstr ""
 "Standart girdiden verilen anahtar parolasını örüntü dosyasıyla "
 "karşılaştırır\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA anahtar çifti %u bit olacak.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "bu komut henüz gerçeklenmedi\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "Parolayı tekrar yazınız\n"
 
@@ -8292,6 +8311,3 @@ msgstr ""
 
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|Yönetici PIN'i"
-
-#~ msgid "[none]"
-#~ msgstr "[yok]"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 444ea961e..a71bb7a60 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2006-07-02 10:58+0800\n"
 "Last-Translator: Meng Jie <zuxyhere@eastday.com>\n"
 "Language-Team: Chinese (simplified) <i18n-translation@lists.linux.net.cn>\n"
@@ -24,71 +24,71 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:597
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
+#, fuzzy
+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:606
+msgid "pinentry.qualitybar.tooltip"
+msgstr ""
+
+#: agent/call-pinentry.c:650
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:600
+#: agent/call-pinentry.c:653
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
-#, fuzzy
-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:658
-msgid "pinentry.qualitybar.tooltip"
-msgstr ""
-
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -98,79 +98,79 @@ 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:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, fuzzy, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr ""
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, fuzzy, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, fuzzy, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, fuzzy, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, fuzzy, c-format
 msgid "error writing key: %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, fuzzy, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr ""
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, fuzzy, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "%s：建立散列表失败：%s\n"
@@ -308,7 +308,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -319,264 +319,264 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 #, fuzzy
 msgid "Please report bugs to <"
 msgstr ""
 "请向 <gnupg-bugs@gnu.org> 报告程序缺陷。\n"
 "请向 <zuxyhere@eastday.com> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -593,8 +593,8 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -602,8 +602,8 @@ msgstr ""
 "@指令：\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -614,91 +614,91 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, fuzzy, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
 msgstr "‘%s’中出错：%s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, fuzzy, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, fuzzy, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, fuzzy, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "读取‘%s’错误：%s\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr ""
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, fuzzy, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -710,19 +710,19 @@ msgstr ""
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -734,7 +734,7 @@ msgstr ""
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -744,11 +744,11 @@ msgstr ""
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -814,39 +814,39 @@ msgstr ""
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, fuzzy, c-format
 msgid "error creating socket: %s\n"
 msgstr "建立‘%s’时发生错误：%s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 #, fuzzy
 msgid "host not found"
 msgstr "[找不到用户标识]"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr ""
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr ""
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 #, fuzzy
 msgid "canceled by user\n"
 msgstr "用户取消\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 #, fuzzy
 msgid "problem with the agent\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
@@ -1083,6 +1083,11 @@ msgstr "‘%s’没有可用的帮助"
 msgid "ignoring garbage line"
 msgstr "结尾行有问题\n"
 
+#: common/gettime.c:503
+#, fuzzy
+msgid "[none]"
+msgstr "[未设定]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1188,7 +1193,7 @@ msgstr "找不到有效的 OpenPGP 数据。\n"
 msgid "not human readable"
 msgstr ""
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
@@ -1198,8 +1203,8 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
@@ -1208,158 +1213,158 @@ msgstr "在批处理模式中无法完成此操作\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "您的选择？ "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[未设定]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "可选"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "必须"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用 ASCII 字符。\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符“<”。\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "卡持有人的姓："
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "卡持有人的名："
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成的姓名太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "获取公钥的 URL："
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "错误：URL 太长(至多 %d 个字符)\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, fuzzy, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "登录数据(帐号名)："
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "错误：登录数据太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "个人 DO 数据："
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "错误：个人 DO 太长(至多 %d 个字符)。\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "首选语言："
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：首选项字符串长度无效。\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：首选项字符串里有无效字符。\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)："
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "CA 指纹："
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "针对密钥的操作无法实现：%s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否为加密密钥创建卡外的备份？(Y/n)"
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "替换已有的密钥？(y/N)"
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1370,124 +1375,124 @@ msgstr ""
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "  (1) 签名密钥\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "  (2) 加密密钥\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "  (3) 认证密钥\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "不支持的密钥保护算法\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "私钥已存储在卡上\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "显示这份在线说明"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "更改获取密钥的 URL"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "更改首选语言首选"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "设定 PIN 签名是否必须"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr ""
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "命令> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "允许使用管理员命令\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -1495,7 +1500,7 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
@@ -1791,37 +1796,37 @@ msgstr "使用子钥 %s 而非主钥 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 #, fuzzy
 msgid "make a signature"
 msgstr "|[文件名]|生成一份签名"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a clear text signature"
 msgstr "|[文件名]|生成一份明文签名"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称加密"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "解密数据(默认)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "列出密钥"
 
@@ -1833,11 +1838,11 @@ msgstr "列出密钥和签名"
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "列出私钥"
 
@@ -1845,7 +1850,7 @@ msgstr "列出私钥"
 msgid "generate a new key pair"
 msgstr "生成一副新的密钥对"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
@@ -1873,11 +1878,11 @@ msgstr "生成一份吊销证书"
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "把密钥导出到某个公钥服务器上"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "从公钥服务器上导入密钥"
 
@@ -1914,20 +1919,20 @@ msgstr "更新信任度数据库"
 msgid "print message digests"
 msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr ""
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 #, fuzzy
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|某甲|为收件者“某甲”加密"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 #, fuzzy
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "使用这个用户标识来签名或解密"
@@ -1941,12 +1946,12 @@ msgstr "|N|设定压缩等级为 N (0 表示不压缩)"
 msgid "use canonical text mode"
 msgstr "使用标准的文本模式"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 #, fuzzy
 msgid "|FILE|write output to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不做任何改变"
 
@@ -1958,7 +1963,7 @@ msgstr "覆盖前先询问"
 msgid "use strict OpenPGP behavior"
 msgstr "行为严格遵循 OpenPGP 定义"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1966,7 +1971,7 @@ msgstr ""
 "@\n"
 "(请参考在线说明以获得所有命令和选项的完整清单)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2006,7 +2011,7 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2034,7 +2039,7 @@ msgstr "压缩："
 msgid "usage: gpg [options] "
 msgstr "用法：gpg [选项] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
@@ -2110,444 +2115,444 @@ msgstr "警告：扩展模块‘%s’的关闭目录权限不安全\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示用户标识"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出密钥时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3154
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3161
+#: g10/gpg.c:3156
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2560,7 +2565,7 @@ msgstr "从这个钥匙环里取用密钥"
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳矛盾仅视为警告"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -3326,19 +3331,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3355,7 +3360,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -4103,12 +4108,12 @@ msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效：改用 %u 位\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4177,76 +4182,81 @@ msgstr "   (%c) 选择是否用于认证\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥种类：\n"
 
-#: g10/keygen.c:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA 和 ElGamal (默认)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA 和 ElGamal (默认)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (仅用于签名)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (自定义用途)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) ElGamal (仅用于加密)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (仅用于签名)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) ElGamal (仅用于加密)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (仅用于加密)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (自定义用途)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (自定义用途)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA 密钥对会有 %u 位。\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "您想要用多大的密钥尺寸？(%u)"
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要用多大的密钥尺寸？(%u)"
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "您所要求的密钥尺寸是 %u 位\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4262,7 +4272,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4278,38 +4288,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4317,11 +4327,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4332,7 +4342,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4348,44 +4358,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4396,7 +4406,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -4411,23 +4421,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:2105
+#: g10/keygen.c:2145
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4435,12 +4445,19 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "请输入密码：这是一个秘密的句子 \n"
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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 +4469,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4462,50 +4479,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4513,42 +4530,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -5066,65 +5083,65 @@ msgstr "警告：使用试验性质的散列算法 %s\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告：不建议使用散列算法 %s\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 算法插件不存在\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：不建议使用该选项“%s”\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请以“%s%s”代替\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s”命令已不建议使用——不要使用它\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr ""
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, fuzzy, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告：“%s”选项已不建议使用\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "%s 也许不能使用这个报文\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的选项 '%s'\n"
@@ -5166,26 +5183,26 @@ msgstr "新的配置文件‘%s’已建立\n"
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, fuzzy, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5198,37 +5215,32 @@ msgstr ""
 "“%.*s”\n"
 "%u 位的 %s 密钥，钥匙号 %s，建立于 %s%s\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "请输入密码\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "用户取消\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, fuzzy, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-#, fuzzy
-msgid "out of core\n"
-msgstr "可选"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
@@ -6343,6 +6355,11 @@ msgstr ""
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr ""
 
+#: jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "可选"
+
 #: jnlib/argparse.c:215
 #, fuzzy, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6437,19 +6454,19 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
@@ -6498,7 +6515,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
@@ -6518,15 +6535,15 @@ msgstr "无法存储创建日期：%s\n"
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
@@ -6545,145 +6562,144 @@ msgstr ""
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 #, fuzzy
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "尚未配置管理员命令的权限\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "尝试管理员 PIN %d 次后，卡将被永久锁定！\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "尚未配置管理员命令的权限\n"
+
+#: scd/app-openpgp.c:1990
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -6700,60 +6716,60 @@ msgstr ""
 msgid "|N|Initial New PIN"
 msgstr "新的 PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr ""
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr ""
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 #, fuzzy
 msgid "|FILE|write a log to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr ""
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr ""
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr ""
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr ""
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr ""
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr ""
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "显示管理员命令"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 #, fuzzy
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
 msgstr ""
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr ""
 
@@ -6860,7 +6876,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 #, fuzzy
 msgid "failed to allocated keyDB handle\n"
 msgstr "无法存储密钥：%s\n"
@@ -7326,148 +7342,148 @@ msgstr "首选项‘%s’重复\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "删除密钥区块时失败：%s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 #, fuzzy
 msgid "no valid recipients given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 #, fuzzy
 msgid "list external keys"
 msgstr "列出私钥"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 #, fuzzy
 msgid "list certificate chain"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 #, fuzzy
 msgid "import certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 #, fuzzy
 msgid "export certificates"
 msgstr "证书已损坏"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 #, fuzzy
 msgid "register a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr ""
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr ""
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 #, fuzzy
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 #, fuzzy
 msgid "create base-64 encoded output"
 msgstr "输出经 ASCII 封装"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr ""
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr ""
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr ""
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr ""
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr ""
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr ""
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr ""
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr ""
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr ""
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr ""
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr ""
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr ""
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 #, fuzzy
 msgid "|FILE|write an audit log to FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr ""
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr ""
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 #, fuzzy
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "从这个钥匙环里取用密钥"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr ""
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr ""
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 #, fuzzy
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "未知的对称加密算法"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 #, fuzzy
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "%s 签名，散列算法 %s\n"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 #, fuzzy
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 #, fuzzy
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
@@ -7478,60 +7494,56 @@ msgstr ""
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 #, fuzzy
 msgid "usage: gpgsm [options] "
 msgstr "用法：gpg [选项] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, fuzzy, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "无法连接至‘%s’：%s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, fuzzy, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, fuzzy, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "(不给定描述)\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr ""
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, fuzzy, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "  s = 跳过这把密钥\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 #, fuzzy
 msgid "could not parse keyserver\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr ""
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7705,7 +7717,7 @@ msgstr "              亦即“%s”"
 msgid "This is a qualified signature\n"
 msgstr "这将是一个自身签名。\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 #, fuzzy
 msgid "quiet"
 msgstr "quit"
@@ -7939,78 +7951,78 @@ msgstr ""
 msgid "Note that group specifications are ignored\n"
 msgstr ""
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr ""
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr ""
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr ""
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr ""
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr ""
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr ""
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr ""
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 #, fuzzy
 msgid "list global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 #, fuzzy
 msgid "check global configuration file"
 msgstr "未知的配置项‘%s’\n"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr ""
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 #, fuzzy
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
 msgstr ""
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 #, fuzzy
 msgid "usage: gpgconf [options] "
 msgstr "用法：gpg [选项] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr ""
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 #, fuzzy
 msgid "Component not found"
 msgstr "找不到公钥"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 #, fuzzy
 msgid "No argument allowed"
 msgstr "不允许使用管理员命令\n"
@@ -8196,6 +8208,9 @@ msgid ""
 "Check a passphrase given on stdin against the patternfile\n"
 msgstr ""
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA 密钥对会有 %u 位。\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "请再输入一次密码\n"
 
@@ -8206,10 +8221,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|管理员 PIN"
 
-#, fuzzy
-#~ msgid "[none]"
-#~ msgstr "[未设定]"
-
 #, fuzzy
 #~ msgid "read options from file"
 #~ msgstr "从‘%s’读取选项\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f4ea1b24c..095ca6c63 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.10rc1\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-05-13 18:04+0200\n"
+"POT-Creation-Date: 2009-06-08 09:58+0200\n"
 "PO-Revision-Date: 2008-12-10 22:48+0800\n"
 "Last-Translator: Jedi Lin <Jedi@Jedi.org>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -26,66 +26,66 @@ msgstr ""
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
 
-#: agent/call-pinentry.c:597
-msgid ""
-"Please enter your PIN, so that the secret key can be unlocked for this "
-"session"
-msgstr "請輸入你的 PIN 以便在此階段作業中解開密鑰"
-
-#: agent/call-pinentry.c:600
-msgid ""
-"Please enter your passphrase, so that the secret key can be unlocked for "
-"this session"
-msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
-
-#. TRANSLATORS: This string is displayed by pinentry as the
-#. label for the quality bar.
-#: agent/call-pinentry.c:635
+#. TRANSLATORS: This string is displayed by Pinentry as the label
+#. for the quality bar.
+#: agent/call-pinentry.c:584
 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:658
+#. 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:606
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "輸入在上面的文字的品質.\n"
 "關於此規範的細節, 請洽你的系統管理者."
 
-#: agent/call-pinentry.c:700
+#: agent/call-pinentry.c:650
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
+msgstr "請輸入你的 PIN 以便在此階段作業中解開密鑰"
+
+#: agent/call-pinentry.c:653
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
+msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
+
+#: agent/call-pinentry.c:710
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "設定錯誤 %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
+#: agent/call-pinentry.c:730 agent/call-pinentry.c:742
 msgid "PIN too long"
 msgstr "PIN 太長"
 
-#: agent/call-pinentry.c:721
+#: agent/call-pinentry.c:731
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:729
+#: agent/call-pinentry.c:739
 msgid "Invalid characters in PIN"
 msgstr "PIN 含有無效的字符"
 
-#: agent/call-pinentry.c:734
+#: agent/call-pinentry.c:744
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:756
 msgid "Bad PIN"
 msgstr "不良的 PIN"
 
-#: agent/call-pinentry.c:747
+#: agent/call-pinentry.c:757
 msgid "Bad Passphrase"
 msgstr "不良的密語"
 
-#: agent/call-pinentry.c:783
+#: agent/call-pinentry.c:793
 msgid "Passphrase"
 msgstr "密語"
 
@@ -94,78 +94,78 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3262
-#: g10/keygen.c:3295 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
+#: agent/command-ssh.c:688 g10/exec.c:478 g10/gpg.c:1079 g10/keygen.c:3311
+#: g10/keygen.c:3344 g10/keyring.c:1237 g10/keyring.c:1556 g10/openfile.c:275
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
 #: jnlib/dotlock.c:310
 #, c-format
 msgid "can't create `%s': %s\n"
 msgstr "無法建立 `%s': %s\n"
 
-#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:760
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:776
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
-#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2794
 #: g10/keyring.c:1582 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:142 g10/tdbdump.c:150 g10/tdbio.c:551
-#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1979
-#: sm/gpgsm.c:2016 sm/gpgsm.c:2054 sm/qualified.c:66
+#: g10/tdbio.c:615 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:1973
+#: sm/gpgsm.c:2010 sm/gpgsm.c:2048 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: agent/command-ssh.c:1617 agent/command-ssh.c:1635
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "取得此卡片序號時出錯: %s\n"
 
-#: agent/command-ssh.c:1621
+#: agent/command-ssh.c:1657
 #, c-format
 msgid "detected card with S/N: %s\n"
 msgstr "偵測到卡片, 其序號為: %s\n"
 
-#: agent/command-ssh.c:1626
+#: agent/command-ssh.c:1662
 #, c-format
 msgid "error getting default authentication keyID of card: %s\n"
 msgstr "取得此卡片的預設認證金鑰 ID 時出錯: %s\n"
 
-#: agent/command-ssh.c:1646
+#: agent/command-ssh.c:1682
 #, c-format
 msgid "no suitable card key found: %s\n"
 msgstr "找不到合適的卡片金鑰: %s\n"
 
-#: agent/command-ssh.c:1696
+#: agent/command-ssh.c:1732
 #, c-format
 msgid "shadowing the key failed: %s\n"
 msgstr "遮蔽金鑰時失敗: %s\n"
 
-#: agent/command-ssh.c:1711
+#: agent/command-ssh.c:1747
 #, c-format
 msgid "error writing key: %s\n"
 msgstr "寫入金鑰時出錯: %s\n"
 
-#: agent/command-ssh.c:2018
+#: agent/command-ssh.c:2055
 #, c-format
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "請輸入此 ssh 金鑰的密語%0A  %c"
 
-#: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "請再次輸入密語"
 
-#: agent/command-ssh.c:2367
+#: agent/command-ssh.c:2404
 #, c-format
 msgid ""
 "Please enter a passphrase to protect the received secret key%%0A   %s%%"
 "0Awithin gpg-agent's key storage"
 msgstr "請輸入密語以保護收到的私鑰%%0A   %s%%0A於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
 
-#: agent/command-ssh.c:2900
+#: agent/command-ssh.c:2937
 #, c-format
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串流失敗: %s\n"
@@ -297,7 +297,7 @@ msgstr "請輸入密語至%0A以保護你的新金鑰"
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: agent/gpg-agent.c:119 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -306,109 +306,109 @@ msgstr ""
 "@選項:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:104
+#: agent/gpg-agent.c:121 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:107
+#: agent/gpg-agent.c:122 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "以服務模式執行 (背景)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
-#: scd/scdaemon.c:108 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:79 tools/symcryptrun.c:164
+#: agent/gpg-agent.c:123 g10/gpg.c:483 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:279 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:164
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:109
-#: sm/gpgsm.c:282
+#: agent/gpg-agent.c:124 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: sm/gpgsm.c:280
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:112 sm/gpgsm.c:311
+#: agent/gpg-agent.c:127 scd/scdaemon.c:113 sm/gpgsm.c:309
 #: tools/symcryptrun.c:167
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從「檔案」中讀取選項"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:122
+#: agent/gpg-agent.c:132 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:133
 msgid "do not grab keyboard and mouse"
 msgstr "不要奪取鍵盤及滑鼠"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:166
+#: agent/gpg-agent.c:134 tools/symcryptrun.c:166
 msgid "use a log file for the server"
 msgstr "為伺服器使用日誌檔"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:136
 msgid "use a standard location for the socket"
 msgstr "為 socket 使用標準的位置"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:139
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:142
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:143
 msgid "do not use the SCdaemon"
 msgstr "不要使用 SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:155
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的要求"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:157
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的要求"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:160
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快取住的 PIN 在 N 秒後到期"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:173
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時不要使用 PIN 快取"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:175
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "允許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:177
 msgid "allow presetting passphrase"
 msgstr "允許預先設定密語"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:178
 msgid "enable ssh-agent emulation"
 msgstr "啟用 ssh-agent 模擬"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:180
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:159
-#: scd/scdaemon.c:243 sm/gpgsm.c:513 tools/gpg-connect-agent.c:180
-#: tools/gpgconf.c:101 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:329 agent/preset-passphrase.c:94 agent/protect-tool.c:160
+#: scd/scdaemon.c:244 sm/gpgsm.c:511 tools/gpg-connect-agent.c:180
+#: tools/gpgconf.c:102 tools/symcryptrun.c:204 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <"
 msgstr "翻譯瑕疵請回報給 <Jedi@Jedi.org>, 程式瑕疵則請回報給 <"
 
-#: agent/gpg-agent.c:337
+#: agent/gpg-agent.c:338
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:339
+#: agent/gpg-agent.c:340
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -416,144 +416,144 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:374 g10/gpg.c:980 scd/scdaemon.c:304 sm/gpgsm.c:640
+#: agent/gpg-agent.c:375 g10/gpg.c:980 scd/scdaemon.c:305 sm/gpgsm.c:638
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
-#: agent/gpg-agent.c:583 agent/protect-tool.c:1029 kbx/kbxutil.c:429
-#: scd/scdaemon.c:398 sm/gpgsm.c:879 sm/gpgsm.c:882 tools/symcryptrun.c:996
+#: agent/gpg-agent.c:584 agent/protect-tool.c:1030 kbx/kbxutil.c:429
+#: scd/scdaemon.c:399 sm/gpgsm.c:877 sm/gpgsm.c:880 tools/symcryptrun.c:996
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:683 g10/gpg.c:2085 scd/scdaemon.c:481 sm/gpgsm.c:969
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:687 agent/gpg-agent.c:1297 g10/gpg.c:2090
-#: scd/scdaemon.c:485 sm/gpgsm.c:975 tools/symcryptrun.c:929
+#: agent/gpg-agent.c:688 agent/gpg-agent.c:1301 g10/gpg.c:2089
+#: scd/scdaemon.c:486 sm/gpgsm.c:973 tools/symcryptrun.c:929
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:696 g10/gpg.c:2096 scd/scdaemon.c:494 sm/gpgsm.c:980
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:1046 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1050 g10/plaintext.c:140 g10/plaintext.c:145
 #: g10/plaintext.c:162
 #, c-format
 msgid "error creating `%s': %s\n"
 msgstr "建立 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1410 agent/gpg-agent.c:1530 agent/gpg-agent.c:1534
-#: agent/gpg-agent.c:1575 agent/gpg-agent.c:1579 g10/exec.c:172
-#: g10/openfile.c:429 scd/scdaemon.c:989
+#: agent/gpg-agent.c:1414 agent/gpg-agent.c:1532 agent/gpg-agent.c:1536
+#: agent/gpg-agent.c:1577 agent/gpg-agent.c:1581 g10/exec.c:172
+#: g10/openfile.c:429 scd/scdaemon.c:990
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1428 scd/scdaemon.c:1004
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1451 scd/scdaemon.c:1027
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:1456
+#: agent/gpg-agent.c:1460
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "socket 名稱 `%s' 太長\n"
 
-#: agent/gpg-agent.c:1476
+#: agent/gpg-agent.c:1478
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1489 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1494 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1506 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1512 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
 
-#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
+#: agent/gpg-agent.c:1540 agent/gpg-agent.c:1587 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "`%s' 目錄已建立\n"
 
-#: agent/gpg-agent.c:1591
+#: agent/gpg-agent.c:1593
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() 失敗於 `%s': %s\n"
 
-#: agent/gpg-agent.c:1595
+#: agent/gpg-agent.c:1597
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1727 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1747
+#: agent/gpg-agent.c:1749
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1752
+#: agent/gpg-agent.c:1754
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1772
+#: agent/gpg-agent.c:1774
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1777
+#: agent/gpg-agent.c:1779
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1919 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2028 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:2154
+#: agent/gpg-agent.c:2156
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2167 common/simple-pwquery.c:352 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2180 common/simple-pwquery.c:364 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -571,8 +571,8 @@ msgstr ""
 "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
-#: tools/gpgconf.c:59
+#: agent/protect-tool.c:112 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:184
+#: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
 " "
@@ -580,8 +580,8 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:123 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
-#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:76
+#: agent/protect-tool.c:124 g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:224 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:157
 msgid ""
 "@\n"
@@ -592,11 +592,11 @@ msgstr ""
 "選項:\n"
 " "
 
-#: agent/protect-tool.c:162
+#: agent/protect-tool.c:163
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法: gpg-protect-tool [選項] (或用 -h 求助)\n"
 
-#: agent/protect-tool.c:164
+#: agent/protect-tool.c:165
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -604,21 +604,21 @@ msgstr ""
 "語法: gpg-protect-tool [選項] [引數]\n"
 "私鑰維護工具\n"
 
-#: agent/protect-tool.c:1150
+#: agent/protect-tool.c:1151
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語來取消 PKCS#12 物件的保護."
 
-#: agent/protect-tool.c:1155
+#: agent/protect-tool.c:1156
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語來保護新的 PKCS#12 物件."
 
-#: agent/protect-tool.c:1161
+#: agent/protect-tool.c:1162
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
-#: agent/protect-tool.c:1166
+#: agent/protect-tool.c:1167
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -626,55 +626,55 @@ msgstr ""
 "請輸入完成這項操作所需的\n"
 "密語或 PIN."
 
-#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1172 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1177 tools/symcryptrun.c:446
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1179 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢問密語時出錯: %s\n"
 
-#: agent/trustlist.c:135 agent/trustlist.c:333
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "開啟 `%s' 時出錯: %s\n"
 
-#: agent/trustlist.c:150 common/helpfile.c:63 common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "檔案 `%s', 第 %d 列: %s\n"
 
-#: agent/trustlist.c:170 agent/trustlist.c:178
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "命令 \"%s\" 忽略於 `%s', 第 %d 列\n"
 
-#: agent/trustlist.c:184
+#: agent/trustlist.c:185
 #, c-format
 msgid "system trustlist `%s' not available\n"
 msgstr "沒有系統信任清單 `%s' 可用\n"
 
-#: agent/trustlist.c:228
+#: agent/trustlist.c:229
 #, c-format
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "不良的指紋於 `%s', 第 %d 列\n"
 
-#: agent/trustlist.c:253 agent/trustlist.c:260
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "無效的金鑰旗標於 `%s', 第 %d 列\n"
 
-#: agent/trustlist.c:294 common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:448
+#: agent/trustlist.c:399 agent/trustlist.c:449
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀取已信任根憑證清單時出錯\n"
 
@@ -686,18 +686,18 @@ msgstr "讀取已信任根憑證清單時出錯\n"
 #. plain % sign, you need to encode it as "%%25".  The
 #. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:609
+#: agent/trustlist.c:610
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:618 common/audit.c:467
+#: agent/trustlist.c:619 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:618 common/audit.c:469
+#: agent/trustlist.c:619 common/audit.c:469
 msgid "No"
 msgstr "No"
 
@@ -709,7 +709,7 @@ msgstr "No"
 #. "%%25".  The second "%s" gets replaced by a hexdecimal
 #. fingerprint string whereas the first one receives the name
 #. as stored in the certificate.
-#: agent/trustlist.c:652
+#: agent/trustlist.c:653
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -719,11 +719,11 @@ msgstr "請驗證憑證與此完全相同:%%0A  \"%s\"%%0A其指紋為:%%0A  %s"
 #. TRANSLATORS: "Correct" is the label of a button and intended
 #. to be hit if the fingerprint matches the one of the CA.  The
 #. other button is "the default "Cancel" of the Pinentry.
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Correct"
 msgstr "正確"
 
-#: agent/trustlist.c:666
+#: agent/trustlist.c:667
 msgid "Wrong"
 msgstr ""
 
@@ -788,37 +788,37 @@ msgstr "執行 `%s' 時出錯: 可能尚未安裝\n"
 msgid "error running `%s': terminated\n"
 msgstr "執行 `%s' 時出錯: 已終止\n"
 
-#: common/http.c:1646
+#: common/http.c:1674
 #, c-format
 msgid "error creating socket: %s\n"
 msgstr "建立 socket 時出錯: %s\n"
 
-#: common/http.c:1690
+#: common/http.c:1718
 msgid "host not found"
 msgstr "找不到主機"
 
-#: common/simple-pwquery.c:335
+#: common/simple-pwquery.c:338
 msgid "gpg-agent is not available in this session\n"
 msgstr "gpg-agent 在此階段無法使用\n"
 
-#: common/simple-pwquery.c:393
+#: common/simple-pwquery.c:395
 #, c-format
 msgid "can't connect to `%s': %s\n"
 msgstr "無法連接至 `%s': %s\n"
 
-#: common/simple-pwquery.c:404
+#: common/simple-pwquery.c:406
 msgid "communication problem with gpg-agent\n"
 msgstr "與 gpg-agent 的溝通問題\n"
 
-#: common/simple-pwquery.c:414
+#: common/simple-pwquery.c:416
 msgid "problem setting the gpg-agent options\n"
 msgstr "設定 gpg-agent 選項時發生問題\n"
 
-#: common/simple-pwquery.c:577 common/simple-pwquery.c:673
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "由使用者取消\n"
 
-#: common/simple-pwquery.c:592 common/simple-pwquery.c:679
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "代理程式的問題\n"
 
@@ -1037,6 +1037,10 @@ msgstr "`%s' 沒有可用的說明."
 msgid "ignoring garbage line"
 msgstr "忽略垃圾列"
 
+#: common/gettime.c:503
+msgid "[none]"
+msgstr "[ 無 ]"
+
 #: g10/armor.c:379
 #, c-format
 msgid "armor: %s\n"
@@ -1140,7 +1144,7 @@ msgstr "警告: 找到無效的標記資料\n"
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/card-util.c:62 g10/card-util.c:358
+#: g10/card-util.c:62 g10/card-util.c:360
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -1150,8 +1154,8 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:75 g10/card-util.c:1512 g10/delkey.c:126 g10/keyedit.c:1549
-#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
+#: g10/card-util.c:75 g10/card-util.c:1528 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/keygen.c:2985 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -1159,157 +1163,157 @@ msgstr "無法在批次模式中這樣做\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版卡片纔能用這個指令\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1877
+#: g10/card-util.c:85 scd/app-openpgp.c:1984
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
-#: g10/card-util.c:122 g10/card-util.c:1242 g10/card-util.c:1321
+#: g10/card-util.c:122 g10/card-util.c:1258 g10/card-util.c:1337
 #: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1598
-#: g10/keygen.c:1665 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
+#: g10/keygen.c:1679 sm/certreqgen-ui.c:128 sm/certreqgen-ui.c:182
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:256 g10/card-util.c:306
+#: g10/card-util.c:258 g10/card-util.c:308
 msgid "[not set]"
 msgstr "[未設定]"
 
-#: g10/card-util.c:492
+#: g10/card-util.c:498
 msgid "male"
 msgstr "男性"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "female"
 msgstr "女性"
 
-#: g10/card-util.c:493
+#: g10/card-util.c:499
 msgid "unspecified"
 msgstr "未特定"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "not forced"
 msgstr "不強迫使用"
 
-#: g10/card-util.c:520
+#: g10/card-util.c:526
 msgid "forced"
 msgstr "強迫使用"
 
-#: g10/card-util.c:601
+#: g10/card-util.c:617
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "錯誤: 目前祇允許使用單純的 ASCII 字符.\n"
 
-#: g10/card-util.c:603
+#: g10/card-util.c:619
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "錯誤: 不能使用 \"<\" 字符.\n"
 
-#: g10/card-util.c:605
+#: g10/card-util.c:621
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "錯誤: 並不允許使用連續兩個以上的空格.\n"
 
-#: g10/card-util.c:622
+#: g10/card-util.c:638
 msgid "Cardholder's surname: "
 msgstr "卡片持有者的姓氏: "
 
-#: g10/card-util.c:624
+#: g10/card-util.c:640
 msgid "Cardholder's given name: "
 msgstr "卡片持有者的名字: "
 
-#: g10/card-util.c:642
+#: g10/card-util.c:658
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "錯誤: 合併後的名字太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:663
+#: g10/card-util.c:679
 msgid "URL to retrieve public key: "
 msgstr "取回公鑰的 URL: "
 
-#: g10/card-util.c:671
+#: g10/card-util.c:687
 #, c-format
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:767 tools/no-libgcrypt.c:30
+#: g10/card-util.c:783 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "配置足夠的記憶體時出錯: %s\n"
 
-#: g10/card-util.c:779 g10/import.c:283
+#: g10/card-util.c:795 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
 
-#: g10/card-util.c:806
+#: g10/card-util.c:822
 msgid "Login data (account name): "
 msgstr "登入資料 (帳號名稱): "
 
-#: g10/card-util.c:816
+#: g10/card-util.c:832
 #, c-format
 msgid "Error: Login data too long (limit is %d characters).\n"
 msgstr "錯誤: 登入資料太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:851
+#: g10/card-util.c:867
 msgid "Private DO data: "
 msgstr "私人的 DO 資料: "
 
-#: g10/card-util.c:861
+#: g10/card-util.c:877
 #, c-format
 msgid "Error: Private DO too long (limit is %d characters).\n"
 msgstr "錯誤: 私人的 DO 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:911
+#: g10/card-util.c:927
 msgid "Language preferences: "
 msgstr "介面語言偏好設定: "
 
-#: g10/card-util.c:919
+#: g10/card-util.c:935
 msgid "Error: invalid length of preference string.\n"
 msgstr "錯誤: 無效的偏好設定字串長度\n"
 
-#: g10/card-util.c:928
+#: g10/card-util.c:944
 msgid "Error: invalid characters in preference string.\n"
 msgstr "錯誤: 偏好設定字串中含有無效的字符\n"
 
-#: g10/card-util.c:949
+#: g10/card-util.c:965
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性別 ((M)男性, (F)女性或留空): "
 
-#: g10/card-util.c:963
+#: g10/card-util.c:979
 msgid "Error: invalid response.\n"
 msgstr "錯誤: 無效的回應.\n"
 
-#: g10/card-util.c:984
+#: g10/card-util.c:1000
 msgid "CA fingerprint: "
 msgstr "憑證中心 (CA) 指紋: "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1023
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "錯誤: 無效的格式化指紋.\n"
 
-#: g10/card-util.c:1055
+#: g10/card-util.c:1071
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "不可能進行金鑰操作: %s\n"
 
-#: g10/card-util.c:1056
+#: g10/card-util.c:1072
 msgid "not an OpenPGP card"
 msgstr "這不是 OpenPGP 卡片"
 
-#: g10/card-util.c:1065
+#: g10/card-util.c:1081
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得現用金鑰資訊時出錯: %s\n"
 
-#: g10/card-util.c:1149
+#: g10/card-util.c:1165
 msgid "Replace existing key? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1169 g10/card-util.c:1178
+#: g10/card-util.c:1185 g10/card-util.c:1194
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "是否要為加密用金鑰建立卡外備份? (Y/n) "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1206
 msgid "Replace existing keys? (y/N) "
 msgstr "是否要取代既有的金鑰? (y/N) "
 
-#: g10/card-util.c:1199
+#: g10/card-util.c:1215
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1320,124 +1324,124 @@ msgstr ""
 "   PIN = `%s'     管理者 PIN = `%s'\n"
 "你應該用 --change-pin 指令來加以變更\n"
 
-#: g10/card-util.c:1233
+#: g10/card-util.c:1249
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1235 g10/card-util.c:1312
+#: g10/card-util.c:1251 g10/card-util.c:1328
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1236 g10/card-util.c:1314
+#: g10/card-util.c:1252 g10/card-util.c:1330
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1237 g10/card-util.c:1316
+#: g10/card-util.c:1253 g10/card-util.c:1332
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1253 g10/card-util.c:1332 g10/keyedit.c:945
-#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1704 g10/revoke.c:685
+#: g10/card-util.c:1269 g10/card-util.c:1348 g10/keyedit.c:945
+#: g10/keygen.c:1602 g10/keygen.c:1630 g10/keygen.c:1732 g10/revoke.c:685
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
-#: g10/card-util.c:1309
+#: g10/card-util.c:1325
 msgid "Please select where to store the key:\n"
 msgstr "請選擇要把金鑰存放在哪裡:\n"
 
-#: g10/card-util.c:1344
+#: g10/card-util.c:1360
 msgid "unknown key protection algorithm\n"
 msgstr "未知的金鑰保護演算法\n"
 
-#: g10/card-util.c:1349
+#: g10/card-util.c:1365
 msgid "secret parts of key are not available\n"
 msgstr "私鑰部分無法取用\n"
 
-#: g10/card-util.c:1354
+#: g10/card-util.c:1370
 msgid "secret key already stored on a card\n"
 msgstr "私鑰已經存放在卡片上了\n"
 
-#: g10/card-util.c:1423 g10/keyedit.c:1380
+#: g10/card-util.c:1439 g10/keyedit.c:1380
 msgid "quit this menu"
 msgstr "離開這個選單"
 
-#: g10/card-util.c:1425
+#: g10/card-util.c:1441
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1426 g10/keyedit.c:1383
+#: g10/card-util.c:1442 g10/keyedit.c:1383
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
-#: g10/card-util.c:1428
+#: g10/card-util.c:1444
 msgid "list all available data"
 msgstr "列出所有可用的資料"
 
-#: g10/card-util.c:1431
+#: g10/card-util.c:1447
 msgid "change card holder's name"
 msgstr "變更卡片持有人的名字"
 
-#: g10/card-util.c:1432
+#: g10/card-util.c:1448
 msgid "change URL to retrieve key"
 msgstr "變更取回金鑰的 URL"
 
-#: g10/card-util.c:1433
+#: g10/card-util.c:1449
 msgid "fetch the key specified in the card URL"
 msgstr "從卡片 URL 取回指定的金鑰"
 
-#: g10/card-util.c:1434
+#: g10/card-util.c:1450
 msgid "change the login name"
 msgstr "變更登入名稱"
 
-#: g10/card-util.c:1435
+#: g10/card-util.c:1451
 msgid "change the language preferences"
 msgstr "變更介面語言偏好設定"
 
-#: g10/card-util.c:1436
+#: g10/card-util.c:1452
 msgid "change card holder's sex"
 msgstr "變更卡片持有者的性別"
 
-#: g10/card-util.c:1437
+#: g10/card-util.c:1453
 msgid "change a CA fingerprint"
 msgstr "變更某個憑證中心 (CA) 的指紋"
 
-#: g10/card-util.c:1438
+#: g10/card-util.c:1454
 msgid "toggle the signature force PIN flag"
 msgstr "切換簽章是否強制使用 PIN 的旗標"
 
-#: g10/card-util.c:1439
+#: g10/card-util.c:1455
 msgid "generate new keys"
 msgstr "產生新的金鑰"
 
-#: g10/card-util.c:1440
+#: g10/card-util.c:1456
 msgid "menu to change or unblock the PIN"
 msgstr "變更或解凍 PIN 的選單"
 
-#: g10/card-util.c:1441
+#: g10/card-util.c:1457
 msgid "verify the PIN and list all data"
 msgstr "驗證 PIN 並列出所有的資料"
 
-#: g10/card-util.c:1442
+#: g10/card-util.c:1458
 msgid "unblock the PIN using a Reset Code"
 msgstr "用重設碼來解凍 PIN"
 
-#: g10/card-util.c:1564 g10/keyedit.c:1654
+#: g10/card-util.c:1580 g10/keyedit.c:1654
 msgid "Command> "
 msgstr "指令> "
 
-#: g10/card-util.c:1607
+#: g10/card-util.c:1623
 msgid "Admin-only command\n"
 msgstr "限管理者使用的指令\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1654
 msgid "Admin commands are allowed\n"
 msgstr "允許使用管理者指令\n"
 
-#: g10/card-util.c:1640
+#: g10/card-util.c:1656
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1726 g10/keyedit.c:2277
+#: g10/card-util.c:1742 g10/keyedit.c:2277
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
@@ -1445,7 +1449,7 @@ msgstr "無效的指令  (試試看 \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:3967 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
@@ -1740,35 +1744,35 @@ msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:372 sm/gpgsm.c:187
+#: g10/gpg.c:372 sm/gpgsm.c:186
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:373 sm/gpgsm.c:188
+#: g10/gpg.c:373 sm/gpgsm.c:187
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:374 sm/gpgsm.c:189
+#: g10/gpg.c:374 sm/gpgsm.c:188
 msgid "make a detached signature"
 msgstr "建立分離式簽章"
 
-#: g10/gpg.c:375 sm/gpgsm.c:190
+#: g10/gpg.c:375 sm/gpgsm.c:189
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:377 sm/gpgsm.c:191
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:379 sm/gpgsm.c:192
+#: g10/gpg.c:379 sm/gpgsm.c:191
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:381 sm/gpgsm.c:193
+#: g10/gpg.c:381 sm/gpgsm.c:192
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:383 sm/gpgsm.c:195
+#: g10/gpg.c:383 sm/gpgsm.c:193
 msgid "list keys"
 msgstr "列出金鑰"
 
@@ -1780,11 +1784,11 @@ msgstr "列出金鑰和簽章"
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:387 sm/gpgsm.c:200
+#: g10/gpg.c:387 sm/gpgsm.c:198
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:388 sm/gpgsm.c:198
+#: g10/gpg.c:388 sm/gpgsm.c:196
 msgid "list secret keys"
 msgstr "列出私鑰"
 
@@ -1792,7 +1796,7 @@ msgstr "列出私鑰"
 msgid "generate a new key pair"
 msgstr "產生新的金鑰對"
 
-#: g10/gpg.c:391 sm/gpgsm.c:203
+#: g10/gpg.c:391 sm/gpgsm.c:201
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
@@ -1820,11 +1824,11 @@ msgstr "產生撤銷憑證"
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:400 sm/gpgsm.c:204
+#: g10/gpg.c:400 sm/gpgsm.c:202
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至金鑰伺服器"
 
-#: g10/gpg.c:401 sm/gpgsm.c:205
+#: g10/gpg.c:401 sm/gpgsm.c:203
 msgid "import keys from a key server"
 msgstr "從金鑰伺服器匯入金鑰"
 
@@ -1860,19 +1864,19 @@ msgstr "更新信任資料庫"
 msgid "print message digests"
 msgstr "印出訊息摘要"
 
-#: g10/gpg.c:434 sm/gpgsm.c:210
+#: g10/gpg.c:434 sm/gpgsm.c:208
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: g10/gpg.c:438 sm/gpgsm.c:228
+#: g10/gpg.c:438 sm/gpgsm.c:226
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:441 sm/gpgsm.c:241
+#: g10/gpg.c:441 sm/gpgsm.c:239
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以「使用者-ID」作為加密對象"
 
-#: g10/gpg.c:454 sm/gpgsm.c:278
+#: g10/gpg.c:454 sm/gpgsm.c:276
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿「使用者-ID」來簽署或解密"
 
@@ -1884,11 +1888,11 @@ msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:480 sm/gpgsm.c:280
+#: g10/gpg.c:480 sm/gpgsm.c:278
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至「檔案」"
 
-#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:291 tools/gpgconf.c:81
+#: g10/gpg.c:496 kbx/kbxutil.c:90 sm/gpgsm.c:289 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -1900,7 +1904,7 @@ msgstr "覆寫前先詢問"
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:580 sm/gpgsm.c:335
+#: g10/gpg.c:580 sm/gpgsm.c:333
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -1908,7 +1912,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:583 sm/gpgsm.c:338
+#: g10/gpg.c:583 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "Examples:\n"
@@ -1947,7 +1951,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:845 sm/gpgsm.c:537
+#: g10/gpg.c:845 sm/gpgsm.c:535
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -1975,7 +1979,7 @@ msgstr "壓縮: "
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1115 sm/gpgsm.c:676
+#: g10/gpg.c:1115 sm/gpgsm.c:674
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
@@ -2051,443 +2055,443 @@ msgstr "警告: 延伸模組 `%s' 的封入目錄權限並不安全\n"
 msgid "unknown configuration item `%s'\n"
 msgstr "未知的組態項目 `%s'\n"
 
-#: g10/gpg.c:1651
+#: g10/gpg.c:1650
 msgid "display photo IDs during key listings"
 msgstr "列出金鑰時顯示照片 ID"
 
-#: g10/gpg.c:1653
+#: g10/gpg.c:1652
 msgid "show policy URLs during signature listings"
 msgstr "列出簽章時顯示原則 URL"
 
-#: g10/gpg.c:1655
+#: g10/gpg.c:1654
 msgid "show all notations during signature listings"
 msgstr "列出簽章時顯示所有的註記"
 
-#: g10/gpg.c:1657
+#: g10/gpg.c:1656
 msgid "show IETF standard notations during signature listings"
 msgstr "列出簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:1661
+#: g10/gpg.c:1660
 msgid "show user-supplied notations during signature listings"
 msgstr "列出簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:1663
+#: g10/gpg.c:1662
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:1665
+#: g10/gpg.c:1664
 msgid "show user ID validity during key listings"
 msgstr "列出金鑰時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:1667
+#: g10/gpg.c:1666
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:1669
+#: g10/gpg.c:1668
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出金鑰時顯示已撤銷或過期的子鑰"
 
-#: g10/gpg.c:1671
+#: g10/gpg.c:1670
 msgid "show the keyring name in key listings"
 msgstr "在金鑰清單中顯示鑰匙圈名稱"
 
-#: g10/gpg.c:1673
+#: g10/gpg.c:1672
 msgid "show expiration dates during signature listings"
 msgstr "列出簽章時顯示有效期限"
 
-#: g10/gpg.c:1834
+#: g10/gpg.c:1833
 #, c-format
 msgid "NOTE: old default options file `%s' ignored\n"
 msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 
-#: g10/gpg.c:1926
+#: g10/gpg.c:1925
 #, c-format
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: g10/gpg.c:2309 g10/gpg.c:2995 g10/gpg.c:3007
+#: g10/gpg.c:2313 g10/gpg.c:2990 g10/gpg.c:3002
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2490 g10/gpg.c:2502
+#: g10/gpg.c:2494 g10/gpg.c:2506
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2584
+#: g10/gpg.c:2588
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2607 g10/gpg.c:2802 g10/keyedit.c:4118
+#: g10/gpg.c:2611 g10/gpg.c:2806 g10/keyedit.c:4118
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:2619
+#: g10/gpg.c:2623
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2622
+#: g10/gpg.c:2626
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2629
+#: g10/gpg.c:2633
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2632
+#: g10/gpg.c:2636
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2639
+#: g10/gpg.c:2643
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2642
+#: g10/gpg.c:2646
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2649
+#: g10/gpg.c:2653
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2652
+#: g10/gpg.c:2656
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2660
+#: g10/gpg.c:2664
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:2662
+#: g10/gpg.c:2666
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:2664
+#: g10/gpg.c:2668
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2670
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2670
+#: g10/gpg.c:2674
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2672
+#: g10/gpg.c:2676
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2674
+#: g10/gpg.c:2678
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2680
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2678
+#: g10/gpg.c:2682
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:2680
+#: g10/gpg.c:2684
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:2682
+#: g10/gpg.c:2686
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:2689
+#: g10/gpg.c:2693
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2692
+#: g10/gpg.c:2696
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2699
+#: g10/gpg.c:2703
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2874
+#: g10/gpg.c:2878
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2877
+#: g10/gpg.c:2881
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2984 sm/gpgsm.c:1389
+#: g10/gpg.c:2979 sm/gpgsm.c:1387
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:2988
+#: g10/gpg.c:2983
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:2997
+#: g10/gpg.c:2992
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3000
+#: g10/gpg.c:2995
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3015
+#: g10/gpg.c:3010
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3029
+#: g10/gpg.c:3024
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:3035
+#: g10/gpg.c:3030
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:3041
+#: g10/gpg.c:3036
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:3054
+#: g10/gpg.c:3049
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3120 g10/gpg.c:3144 sm/gpgsm.c:1461
+#: g10/gpg.c:3115 g10/gpg.c:3139 sm/gpgsm.c:1459
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
+#: g10/gpg.c:3121 g10/gpg.c:3145 sm/gpgsm.c:1465 sm/gpgsm.c:1471
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3132
+#: g10/gpg.c:3127
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3138
+#: g10/gpg.c:3133
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3153
+#: g10/gpg.c:3148
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3155
+#: g10/gpg.c:3150
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3157
+#: g10/gpg.c:3152
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3159
+#: g10/gpg.c:3154
 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:3161
+#: g10/gpg.c:3156
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3164
+#: g10/gpg.c:3159
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3168
+#: g10/gpg.c:3163
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3175
+#: g10/gpg.c:3170
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3184
+#: g10/gpg.c:3179
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3188
+#: g10/gpg.c:3183
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3192
+#: g10/gpg.c:3187
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3225
+#: g10/gpg.c:3220
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3272
+#: g10/gpg.c:3267
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3277
+#: g10/gpg.c:3272
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3277
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3365
+#: g10/gpg.c:3363
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3376
+#: g10/gpg.c:3374
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3397
+#: g10/gpg.c:3395
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3404
+#: g10/gpg.c:3402
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3406
+#: g10/gpg.c:3404
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3416
+#: g10/gpg.c:3414
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3429
+#: g10/gpg.c:3427
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3431
+#: g10/gpg.c:3429
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3434
+#: g10/gpg.c:3432
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3452
+#: g10/gpg.c:3450
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3465
+#: g10/gpg.c:3463
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3480
+#: g10/gpg.c:3478
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3482
+#: g10/gpg.c:3480
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3485
+#: g10/gpg.c:3483
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3503
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3514
+#: g10/gpg.c:3512
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3539
+#: g10/gpg.c:3537
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3547
+#: g10/gpg.c:3545
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3551
+#: g10/gpg.c:3549
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3572
+#: g10/gpg.c:3570
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3664
+#: g10/gpg.c:3662
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3666
+#: g10/gpg.c:3664
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3668
+#: g10/gpg.c:3666
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3679
+#: g10/gpg.c:3677
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3689
+#: g10/gpg.c:3687
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3740
+#: g10/gpg.c:3738
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3748
+#: g10/gpg.c:3746
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3836
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:3955
+#: g10/gpg.c:3953
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:3959
+#: g10/gpg.c:3957
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:4273
+#: g10/gpg.c:4271
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4275
+#: g10/gpg.c:4273
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4308
+#: g10/gpg.c:4306
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2499,7 +2503,7 @@ msgstr "|檔案|從鑰匙圈「檔案」裡取用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:78 sm/gpgsm.c:325
+#: g10/gpgv.c:78 sm/gpgsm.c:323
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此「檔案描述」"
 
@@ -3269,19 +3273,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:3637
+#: g10/keyedit.c:1142 g10/keygen.c:3687
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3674 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3640
+#: g10/keyedit.c:1150 g10/keygen.c:3690
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3644
+#: g10/keyedit.c:1156 g10/keygen.c:3694
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3298,7 +3302,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2177
+#: g10/keyedit.c:1207 g10/keygen.c:2224
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -4048,12 +4052,12 @@ msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
 #: g10/keygen.c:1158 g10/keygen.c:1269 g10/keygen.c:1274 g10/keygen.c:1409
-#: g10/keygen.c:3137
+#: g10/keygen.c:3186
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3192
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4122,76 +4126,81 @@ msgstr "   (%c) 切換鑑定性能\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1650 sm/certreqgen-ui.c:121
+#: g10/keygen.c:1654 sm/certreqgen-ui.c:121
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇你要使用的金鑰種類:\n"
 
-#: g10/keygen.c:1652
-#, c-format
-msgid "   (%d) DSA and Elgamal (default)\n"
+#: g10/keygen.c:1657
+#, fuzzy, c-format
+msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) DSA 和 Elgamal (預設)\n"
 
-#: g10/keygen.c:1653
+#: g10/keygen.c:1659
+#, fuzzy, c-format
+msgid "   (%d) DSA and Elgamal\n"
+msgstr "   (%d) DSA 和 Elgamal (預設)\n"
+
+#: g10/keygen.c:1661
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:1655
-#, c-format
-msgid "   (%d) DSA (set your own capabilities)\n"
-msgstr "   (%d) DSA (你能自己設定性能)\n"
-
-#: g10/keygen.c:1657
-#, c-format
-msgid "   (%d) Elgamal (encrypt only)\n"
-msgstr "   (%d) Elgamal (僅能用於加密)\n"
-
-#: g10/keygen.c:1658
+#: g10/keygen.c:1662
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA (僅能用於簽署)\n"
 
-#: g10/keygen.c:1660
+#: g10/keygen.c:1666
+#, c-format
+msgid "   (%d) Elgamal (encrypt only)\n"
+msgstr "   (%d) Elgamal (僅能用於加密)\n"
+
+#: g10/keygen.c:1667
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA (僅能用於加密)\n"
 
-#: g10/keygen.c:1662
+#: g10/keygen.c:1671
+#, c-format
+msgid "   (%d) DSA (set your own capabilities)\n"
+msgstr "   (%d) DSA (你能自己設定性能)\n"
+
+#: g10/keygen.c:1672
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA (你能自己設定性能)\n"
 
-#: g10/keygen.c:1731
-#, c-format
-msgid "DSA keypair will have %u bits.\n"
-msgstr "DSA 金鑰對會有 %u 位元長.\n"
-
-#: g10/keygen.c:1741
+#: g10/keygen.c:1780
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 
-#: g10/keygen.c:1748 sm/certreqgen-ui.c:142
+#: g10/keygen.c:1788
+#, fuzzy, c-format
+msgid "What keysize do you want for the subkey? (%u) "
+msgstr "你想要用多大的金鑰尺寸? (%u) "
+
+#: g10/keygen.c:1791 sm/certreqgen-ui.c:142
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1762 sm/certreqgen-ui.c:147
+#: g10/keygen.c:1799 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:1768 sm/certreqgen-ui.c:152
+#: g10/keygen.c:1805 sm/certreqgen-ui.c:152
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 
-#: g10/keygen.c:1773 g10/keygen.c:1778 sm/certreqgen-ui.c:157
+#: g10/keygen.c:1812 g10/keygen.c:1818 sm/certreqgen-ui.c:157
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1853
+#: g10/keygen.c:1893
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4207,7 +4216,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:1864
+#: g10/keygen.c:1904
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4223,38 +4232,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:1887
+#: g10/keygen.c:1927
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1892
+#: g10/keygen.c:1932
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1910 g10/keygen.c:1935
+#: g10/keygen.c:1950 g10/keygen.c:1975
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1917
+#: g10/keygen.c:1957
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1918
+#: g10/keygen.c:1958
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1923
+#: g10/keygen.c:1963
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1964
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:1928
+#: g10/keygen.c:1968
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4262,11 +4271,11 @@ msgstr ""
 "你的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1941
+#: g10/keygen.c:1981
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1971
+#: g10/keygen.c:2011
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4280,7 +4289,7 @@ msgstr ""
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:1986
+#: g10/keygen.c:2026
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4295,44 +4304,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:2005
+#: g10/keygen.c:2045
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2053
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:2015
+#: g10/keygen.c:2055
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:2017
+#: g10/keygen.c:2057
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:2025
+#: g10/keygen.c:2065
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:2031
+#: g10/keygen.c:2071
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:2039
+#: g10/keygen.c:2079
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:2045
+#: g10/keygen.c:2085
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:2067
+#: g10/keygen.c:2107
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "你正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:2073
+#: g10/keygen.c:2113
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4343,7 +4352,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2078
+#: g10/keygen.c:2118
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
@@ -4358,23 +4367,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2094
+#: g10/keygen.c:2134
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2104
+#: g10/keygen.c:2144
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2105
+#: g10/keygen.c:2145
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2124
+#: g10/keygen.c:2164
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2163
+#: g10/keygen.c:2206
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4382,12 +4391,19 @@ msgstr ""
 "你需要一個密語來保護你的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2178
+#: g10/keygen.c:2209
+#, fuzzy
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
+msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
+
+#: g10/keygen.c:2225
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2184
+#: g10/keygen.c:2231
 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"
@@ -4399,7 +4415,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2208
+#: g10/keygen.c:2255
 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"
@@ -4410,50 +4426,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:3077 g10/keygen.c:3104
+#: g10/keygen.c:3126 g10/keygen.c:3153
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:3309 g10/keygen.c:3476
+#: g10/keygen.c:3358 g10/keygen.c:3525
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:3311 g10/keygen.c:3479
+#: g10/keygen.c:3360 g10/keygen.c:3528
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3314 g10/keygen.c:3482
+#: g10/keygen.c:3363 g10/keygen.c:3531
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
 
-#: g10/keygen.c:3463
+#: g10/keygen.c:3512
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3470
+#: g10/keygen.c:3519
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3490
+#: g10/keygen.c:3539
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3498
+#: g10/keygen.c:3547
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3525
+#: g10/keygen.c:3574
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:3536
+#: g10/keygen.c:3585
 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"
@@ -4461,42 +4477,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
+#: g10/keygen.c:3598 g10/keygen.c:3744 g10/keygen.c:3865
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
+#: g10/keygen.c:3654 g10/keygen.c:3795 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:3606 g10/keygen.c:3747 g10/sign.c:243
+#: g10/keygen.c:3656 g10/keygen.c:3797 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:3617 g10/keygen.c:3758
+#: g10/keygen.c:3667 g10/keygen.c:3808
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3658 g10/keygen.c:3791
+#: g10/keygen.c:3708 g10/keygen.c:3841
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3964
+#: g10/keygen.c:4029
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:4012
+#: g10/keygen.c:4078
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:4038
+#: g10/keygen.c:4104
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -5013,65 +5029,65 @@ msgstr "警告: 正在使用實驗性的 %s 摘要演算法\n"
 msgid "WARNING: digest algorithm %s is deprecated\n"
 msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 
-#: g10/misc.c:512
+#: g10/misc.c:503
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:513 g10/sig-check.c:107 jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 %s 上進一步的資訊\n"
 
-#: g10/misc.c:770
+#: g10/misc.c:761
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d: 不建議使用的選項 \"%s\"\n"
 
-#: g10/misc.c:774
+#: g10/misc.c:765
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告: 已不建議使用 \"%s\" 選項\n"
 
-#: g10/misc.c:776
+#: g10/misc.c:767
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "請改以 \"%s%s\" 代替\n"
 
-#: g10/misc.c:783
+#: g10/misc.c:774
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告: \"%s\" 是個棄而不顧的指令 - 別再用了\n"
 
-#: g10/misc.c:793
+#: g10/misc.c:784
 #, c-format
 msgid "%s:%u: obsolete option \"%s\" - it has no effect\n"
 msgstr "%s:%u: 廢棄的 \"%s\" 選項 - 沒有任何影響\n"
 
-#: g10/misc.c:796
+#: g10/misc.c:787
 #, c-format
 msgid "WARNING: \"%s\" is an obsolete option - it has no effect\n"
 msgstr "警告: \"%s\" 是已廢棄的選項 - 沒有效果\n"
 
-#: g10/misc.c:857
+#: g10/misc.c:848
 msgid "Uncompressed"
 msgstr "未壓縮"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:882
+#: g10/misc.c:873
 msgid "uncompressed|none"
 msgstr "uncompressed|none|未壓縮|無"
 
-#: g10/misc.c:1009
+#: g10/misc.c:1000
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "這個訊息對 %s 來說無法使用\n"
 
-#: g10/misc.c:1184
+#: g10/misc.c:1175
 #, c-format
 msgid "ambiguous option `%s'\n"
 msgstr "不明確的 `%s' 選項\n"
 
-#: g10/misc.c:1209
+#: g10/misc.c:1200
 #, c-format
 msgid "unknown option `%s'\n"
 msgstr "未知的 `%s' 選項\n"
@@ -5113,26 +5129,26 @@ msgstr "新的設定檔 `%s' 被建立了\n"
 msgid "WARNING: options in `%s' are not yet active during this run\n"
 msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 
-#: g10/parse-packet.c:191
+#: g10/parse-packet.c:201
 #, c-format
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作 %d 公開金鑰演算法\n"
 
-#: g10/parse-packet.c:808
+#: g10/parse-packet.c:818
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 
-#: g10/parse-packet.c:1259
+#: g10/parse-packet.c:1269
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:588
+#: g10/passphrase.c:288 g10/passphrase.c:548
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
 
-#: g10/passphrase.c:308
+#: g10/passphrase.c:302
 #, c-format
 msgid ""
 "Please enter the passphrase to unlock the secret key for the OpenPGP "
@@ -5146,24 +5162,20 @@ msgstr ""
 "%u 位元長的 %s 金鑰, ID %s,\n"
 "建立於 %s%s.\n"
 
-#: g10/passphrase.c:334
+#: g10/passphrase.c:328
 msgid "Enter passphrase\n"
 msgstr "請輸入密語\n"
 
-#: g10/passphrase.c:362
+#: g10/passphrase.c:356
 msgid "cancelled by user\n"
 msgstr "由使用者所取消\n"
 
-#: g10/passphrase.c:368 g10/passphrase.c:431
+#: g10/passphrase.c:362 g10/passphrase.c:425
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題: %s\n"
 
-#: g10/passphrase.c:458 jnlib/argparse.c:213
-msgid "out of core\n"
-msgstr "超出核心\n"
-
-#: g10/passphrase.c:567
+#: g10/passphrase.c:527
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5172,12 +5184,12 @@ msgstr ""
 "你需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:575
+#: g10/passphrase.c:535
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:584
+#: g10/passphrase.c:544
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
@@ -6286,6 +6298,10 @@ msgstr "\"%.50s\" 選項不明確\n"
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "\"%.50s\" 指令不明確\n"
 
+#: jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "超出核心\n"
+
 #: jnlib/argparse.c:215
 #, c-format
 msgid "invalid option \"%.50s\"\n"
@@ -6378,19 +6394,19 @@ msgstr ""
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#: scd/app-nks.c:712 scd/app-openpgp.c:2492
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#: scd/app-nks.c:720 scd/app-openpgp.c:2504
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
 #: scd/app-nks.c:800 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1886
-#: scd/app-dinsig.c:303
+#: scd/app-openpgp.c:1688 scd/app-openpgp.c:1705 scd/app-openpgp.c:1949
+#: scd/app-openpgp.c:1994 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回 PIN 時傳回錯誤: %s\n"
@@ -6439,7 +6455,7 @@ msgid ""
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:2027 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的 PIN 時出錯: %s\n"
@@ -6459,15 +6475,15 @@ msgstr "存放創生日期失敗: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2727
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2735
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2745
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
@@ -6486,143 +6502,142 @@ msgstr "使用預設 PIN 做為 %s 失敗: %s - 正在停用之後的預設使
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1481
+#: scd/app-openpgp.c:1481 scd/app-openpgp.c:1943
 msgid "||Please enter the PIN"
 msgstr "||請輸入 PIN"
 
-#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1691
+#: scd/app-openpgp.c:1522 scd/app-openpgp.c:1712 scd/app-openpgp.c:1956
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的 PIN 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2925
+#: scd/app-openpgp.c:1535 scd/app-openpgp.c:1586 scd/app-openpgp.c:1724
+#: scd/app-openpgp.c:3044
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1598
-msgid "access to admin commands is not configured\n"
-msgstr "管理者指令存取權限尚未組態\n"
-
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
+#: scd/app-openpgp.c:1615 scd/app-openpgp.c:1975 scd/app-openpgp.c:3307
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:3316
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
-#: scd/app-openpgp.c:1634
+#: scd/app-openpgp.c:1628
 #, c-format
 msgid "%d Admin PIN attempts remaining before card is permanently locked\n"
 msgstr "%d 管理者 PIN 試圖在卡片永久鎖定前遺留下來\n"
 
-#. TRANSLATORS: Do not translate the "|A|" prefix but keep
-#. it at the start of the string.  Use %%0A to force a
-#. lienfeed.
-#: scd/app-openpgp.c:1642
+#. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
+#. the start of the string.  Use %%0A to force a linefeed.
+#: scd/app-openpgp.c:1635
 #, fuzzy, c-format
 msgid "|A|Please enter the Admin PIN%%0A[remaining attempts: %d]"
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN%%0A[剩餘嘗試次數: %d]"
 
-#: scd/app-openpgp.c:1654
+#: scd/app-openpgp.c:1639
 #, fuzzy
 msgid "|A|Please enter the Admin PIN"
 msgstr "||請輸入 PIN"
 
-#: scd/app-openpgp.c:1882
+#: scd/app-openpgp.c:1660
+msgid "access to admin commands is not configured\n"
+msgstr "管理者指令存取權限尚未組態\n"
+
+#: scd/app-openpgp.c:1990
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
+#: scd/app-openpgp.c:2000 scd/app-openpgp.c:2052
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1925
+#: scd/app-openpgp.c:2022
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增重設碼"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者 PIN"
 
-#: scd/app-openpgp.c:1926
+#: scd/app-openpgp.c:2023
 msgid "|N|New PIN"
 msgstr "|N|新增 PIN"
 
-#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
+#: scd/app-openpgp.c:2132 scd/app-openpgp.c:2813
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
+#: scd/app-openpgp.c:2138 scd/app-openpgp.c:2820
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:2032
+#: scd/app-openpgp.c:2148
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2152
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:2038
+#: scd/app-openpgp.c:2154
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:2364
+#: scd/app-openpgp.c:2480
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
+#: scd/app-openpgp.c:2514 scd/app-openpgp.c:2522
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:2499
+#: scd/app-openpgp.c:2618
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:2585
+#: scd/app-openpgp.c:2704
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:2598
+#: scd/app-openpgp.c:2717
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:2601
+#: scd/app-openpgp.c:2720
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2659
+#: scd/app-openpgp.c:2778
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2709
+#: scd/app-openpgp.c:2828
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:2824
+#: scd/app-openpgp.c:2943
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:2900
+#: scd/app-openpgp.c:3019
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:3202
+#: scd/app-openpgp.c:3321
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
+#: scd/app-openpgp.c:3546 scd/app-openpgp.c:3557
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -6638,52 +6653,52 @@ msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
 msgid "|N|Initial New PIN"
 msgstr "|N|開始新增 PIN"
 
-#: scd/scdaemon.c:106
+#: scd/scdaemon.c:107
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
 
-#: scd/scdaemon.c:116 sm/gpgsm.c:315
+#: scd/scdaemon.c:117 sm/gpgsm.c:313
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為「等級」"
 
-#: scd/scdaemon.c:123 tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|檔案|將日誌寫入至「檔案」"
 
-#: scd/scdaemon.c:125
+#: scd/scdaemon.c:126
 msgid "|N|connect to reader at port N"
 msgstr "|N|從 N 埠連線至讀卡機"
 
-#: scd/scdaemon.c:127
+#: scd/scdaemon.c:128
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|名稱|使用「名稱」做為 ct-API 驅動程式"
 
-#: scd/scdaemon.c:129
+#: scd/scdaemon.c:130
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|名稱|使用「名稱」做為 PC/SC 驅動程式"
 
-#: scd/scdaemon.c:132
+#: scd/scdaemon.c:133
 msgid "do not use the internal CCID driver"
 msgstr "不要使用內部的 CCID 驅動程式"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|沒有活動達 N 秒後就與卡片斷線"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "do not use a reader's keypad"
 msgstr "不要使用讀卡機鍵盤"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 #, fuzzy
 msgid "deny the use of admin card commands"
 msgstr "允許使用管理者卡片指令"
 
-#: scd/scdaemon.c:256
+#: scd/scdaemon.c:257
 msgid "Usage: scdaemon [options] (-h for help)"
 msgstr "用法: scdaemon [選項] (或用 -h 求助)"
 
-#: scd/scdaemon.c:258
+#: scd/scdaemon.c:259
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for GnuPG\n"
@@ -6691,7 +6706,7 @@ msgstr ""
 "語法: scdaemon [選項] [指令 [引數]]\n"
 "GnuPg 智慧卡服務\n"
 
-#: scd/scdaemon.c:736
+#: scd/scdaemon.c:737
 msgid "please use the option `--daemon' to run the program in the background\n"
 msgstr "請使用 `--daemon' 選項來將此程式執行於背景\n"
 
@@ -6796,7 +6811,7 @@ msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
 
 #: sm/certchain.c:744 sm/certchain.c:1231 sm/certchain.c:1835 sm/decrypt.c:259
-#: sm/encrypt.c:347 sm/sign.c:327 sm/verify.c:113
+#: sm/encrypt.c:335 sm/sign.c:327 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "配置 keyDB handle 失敗\n"
 
@@ -7234,135 +7249,135 @@ msgstr "憑證 `%s' 已刪除\n"
 msgid "deleting certificate \"%s\" failed: %s\n"
 msgstr "刪除憑證 \"%s\" 時失敗: %s\n"
 
-#: sm/encrypt.c:333
+#: sm/encrypt.c:321
 msgid "no valid recipients given\n"
 msgstr "沒有給定有效的收件者\n"
 
-#: sm/gpgsm.c:197
+#: sm/gpgsm.c:195
 msgid "list external keys"
 msgstr "列出外部金鑰"
 
-#: sm/gpgsm.c:199
+#: sm/gpgsm.c:197
 msgid "list certificate chain"
 msgstr "列出憑證鏈"
 
-#: sm/gpgsm.c:206
+#: sm/gpgsm.c:204
 msgid "import certificates"
 msgstr "匯入憑證"
 
-#: sm/gpgsm.c:207
+#: sm/gpgsm.c:205
 msgid "export certificates"
 msgstr "匯出憑證"
 
-#: sm/gpgsm.c:209
+#: sm/gpgsm.c:207
 msgid "register a smartcard"
 msgstr "註冊智慧卡"
 
-#: sm/gpgsm.c:212
+#: sm/gpgsm.c:210
 msgid "pass a command to the dirmngr"
 msgstr "將指令遞送給 dirmngr"
 
-#: sm/gpgsm.c:214
+#: sm/gpgsm.c:212
 msgid "invoke gpg-protect-tool"
 msgstr "叫用 gpg-protect-tool"
 
-#: sm/gpgsm.c:215
+#: sm/gpgsm.c:213
 msgid "change a passphrase"
 msgstr "更改密語"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:228
 msgid "create base-64 encoded output"
 msgstr "建立以 base-64 編碼過的輸出"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:233
 msgid "assume input is in PEM format"
 msgstr "假設輸入的是 PEM 格式"
 
-#: sm/gpgsm.c:237
+#: sm/gpgsm.c:235
 msgid "assume input is in base-64 format"
 msgstr "假設輸入的是 base-64 格式"
 
-#: sm/gpgsm.c:239
+#: sm/gpgsm.c:237
 msgid "assume input is in binary format"
 msgstr "假設輸入的是二進制格式"
 
-#: sm/gpgsm.c:244
+#: sm/gpgsm.c:242
 msgid "use system's dirmngr if available"
 msgstr "如果系統有 dirmngr 的話就拿來用"
 
-#: sm/gpgsm.c:247
+#: sm/gpgsm.c:245
 msgid "never consult a CRL"
 msgstr "永遠不要查閱 CRL"
 
-#: sm/gpgsm.c:257
+#: sm/gpgsm.c:255
 msgid "check validity using OCSP"
 msgstr "用 OCSP 檢查有效性"
 
-#: sm/gpgsm.c:262
+#: sm/gpgsm.c:260
 msgid "|N|number of certificates to include"
 msgstr "|N|要包含的憑證數量"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:263
 msgid "|FILE|take policy information from FILE"
 msgstr "|檔案|從「檔案」中取得原則資訊"
 
-#: sm/gpgsm.c:268
+#: sm/gpgsm.c:266
 msgid "do not check certificate policies"
 msgstr "不要檢查憑證原則"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:270
 msgid "fetch missing issuer certificates"
 msgstr "取回遺失的發行者憑證"
 
-#: sm/gpgsm.c:283
+#: sm/gpgsm.c:281
 msgid "don't use the terminal at all"
 msgstr "完全不要使用終端機"
 
-#: sm/gpgsm.c:285
+#: sm/gpgsm.c:283
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|檔案|將伺服器模式日誌寫入至「檔案」"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:288
 msgid "|FILE|write an audit log to FILE"
 msgstr "|檔案|將稽核日誌寫入至「檔案」"
 
-#: sm/gpgsm.c:292
+#: sm/gpgsm.c:290
 msgid "batch mode: never ask"
 msgstr "批次模式: 永遠不詢問"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:291
 msgid "assume yes on most questions"
 msgstr "假設大部分的問題都回答是"
 
-#: sm/gpgsm.c:294
+#: sm/gpgsm.c:292
 msgid "assume no on most questions"
 msgstr "假設大部分的問題都回答否"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:295
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|檔案|將此金鑰鑰匙圈加到金鑰鑰匙圈清單「檔案」中"
 
-#: sm/gpgsm.c:300
+#: sm/gpgsm.c:298
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|使用者-ID|使用「使用者-ID」做為預設私鑰"
 
-#: sm/gpgsm.c:310 tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:308 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 
-#: sm/gpgsm.c:328
+#: sm/gpgsm.c:326
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|名稱|使用「名稱」編密演算法"
 
-#: sm/gpgsm.c:330
+#: sm/gpgsm.c:328
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|名稱|使用「名稱」訊息摘要演算法"
 
-#: sm/gpgsm.c:516
+#: sm/gpgsm.c:514
 msgid "Usage: gpgsm [options] [files] (-h for help)"
 msgstr "用法: gpgsm [選項] [檔案] (或用 -h 求助)"
 
-#: sm/gpgsm.c:519
+#: sm/gpgsm.c:517
 msgid ""
 "Syntax: gpgsm [options] [files]\n"
 "sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -7372,58 +7387,54 @@ msgstr ""
 "用 S/MIME 協定來簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: sm/gpgsm.c:611
+#: sm/gpgsm.c:609
 msgid "usage: gpgsm [options] "
 msgstr "用法: gpgsm [選項] "
 
-#: sm/gpgsm.c:709
+#: sm/gpgsm.c:707
 #, c-format
 msgid "NOTE: won't be able to encrypt to `%s': %s\n"
 msgstr "請注意: 將無法加密為 `%s': %s\n"
 
-#: sm/gpgsm.c:720
+#: sm/gpgsm.c:718
 #, c-format
 msgid "unknown validation model `%s'\n"
 msgstr "未知的驗證模型 `%s'\n"
 
-#: sm/gpgsm.c:771
+#: sm/gpgsm.c:769
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: 沒有給定主機名稱\n"
 
-#: sm/gpgsm.c:790
+#: sm/gpgsm.c:788
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: 給定的密碼沒有使用者\n"
 
-#: sm/gpgsm.c:811
+#: sm/gpgsm.c:809
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳過這一列\n"
 
-#: sm/gpgsm.c:1325
+#: sm/gpgsm.c:1323
 msgid "could not parse keyserver\n"
 msgstr "無法剖析金鑰伺服器\n"
 
-#: sm/gpgsm.c:1406
+#: sm/gpgsm.c:1404
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: sm/gpgsm.c:1506
+#: sm/gpgsm.c:1504
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "正在匯入通用憑證 `%s'\n"
 
-#: sm/gpgsm.c:1544
+#: sm/gpgsm.c:1542
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法用 `%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:1715
-msgid "this command has not yet been implemented\n"
-msgstr "這個指令尚未實做完成\n"
-
-#: sm/gpgsm.c:1870
+#: sm/gpgsm.c:1864
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
 
@@ -7598,7 +7609,7 @@ msgstr "                亦即"
 msgid "This is a qualified signature\n"
 msgstr "這是一份合格簽章\n"
 
-#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:80 tools/symcryptrun.c:165
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:165
 msgid "quiet"
 msgstr "安靜模式"
 
@@ -7826,55 +7837,55 @@ msgstr "元件 %s 的外部驗證失敗"
 msgid "Note that group specifications are ignored\n"
 msgstr "請注意群組規格已忽略\n"
 
-#: tools/gpgconf.c:61
+#: tools/gpgconf.c:62
 msgid "list all components"
 msgstr "列出所有的元件"
 
-#: tools/gpgconf.c:62
+#: tools/gpgconf.c:63
 msgid "check all programs"
 msgstr "檢查所有的程式"
 
-#: tools/gpgconf.c:63
+#: tools/gpgconf.c:64
 msgid "|COMPONENT|list options"
 msgstr "|元件|列出選項"
 
-#: tools/gpgconf.c:64
+#: tools/gpgconf.c:65
 msgid "|COMPONENT|change options"
 msgstr "|元件|變更選項"
 
-#: tools/gpgconf.c:65
+#: tools/gpgconf.c:66
 msgid "|COMPONENT|check options"
 msgstr "|元件|檢查選項"
 
-#: tools/gpgconf.c:67
+#: tools/gpgconf.c:68
 msgid "apply global default values"
 msgstr "套用全域預設值"
 
-#: tools/gpgconf.c:69
+#: tools/gpgconf.c:70
 msgid "get the configuration directories for gpgconf"
 msgstr "取得 gpgconf 的組態目錄"
 
-#: tools/gpgconf.c:71
+#: tools/gpgconf.c:72
 msgid "list global configuration file"
 msgstr "列出全域組態檔"
 
-#: tools/gpgconf.c:73
+#: tools/gpgconf.c:74
 msgid "check global configuration file"
 msgstr "檢查全域組態檔案"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "use as output file"
 msgstr "當作輸出檔案來使用"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "activate changes at runtime, if possible"
 msgstr "如果可能的話, 在執行期啟用變更"
 
-#: tools/gpgconf.c:104
+#: tools/gpgconf.c:105
 msgid "Usage: gpgconf [options] (-h for help)"
 msgstr "用法: gpgconf [選項] (或用 -h 求助)"
 
-#: tools/gpgconf.c:107
+#: tools/gpgconf.c:108
 msgid ""
 "Syntax: gpgconf [options]\n"
 "Manage configuration options for tools of the GnuPG system\n"
@@ -7882,19 +7893,19 @@ msgstr ""
 "語法: gpgconf [選項]\n"
 "管理 GnuPG 系統工具的組態選項\n"
 
-#: tools/gpgconf.c:212 tools/gpgconf.c:277
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpgconf [選項] "
 
-#: tools/gpgconf.c:214
+#: tools/gpgconf.c:216
 msgid "Need one component argument"
 msgstr "需要一個元件引數"
 
-#: tools/gpgconf.c:223 tools/gpgconf.c:253
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "找不到元件"
 
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:281
 msgid "No argument allowed"
 msgstr "未允許使用引數"
 
@@ -8078,6 +8089,12 @@ msgstr ""
 "語法: gpg-check-pattern [選項] 樣式檔案\n"
 "用樣式檔案來檢查由標準輸入給定的密語\n"
 
+#~ msgid "DSA keypair will have %u bits.\n"
+#~ msgstr "DSA 金鑰對會有 %u 位元長.\n"
+
+#~ msgid "this command has not yet been implemented\n"
+#~ msgstr "這個指令尚未實做完成\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "請再輸入一次密語\n"
 
@@ -8087,9 +8104,6 @@ msgstr ""
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|管理者 PIN"
 
-#~ msgid "[none]"
-#~ msgstr "[ 無 ]"
-
 #~ msgid "read options from file"
 #~ msgstr "從檔案中讀取選項"
 
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 3010f0ce5..c29e33da5 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -2833,11 +2833,11 @@ compare_fingerprint (app_t app, int keyno, unsigned char *sha1fpr)
 }
 
 
-  /* If a fingerprint has been specified check it against the one on
-     the card.  This is allows for a meaningful error message in case
-     the key on the card has been replaced but the shadow information
-     known to gpg was not updated.  If there is no fingerprint we
-     assume that this is okay. */
+/* If a fingerprint has been specified check it against the one on the
+   card.  This allows for a meaningful error message in case the key
+   on the card has been replaced but the shadow information known to
+   gpg has not been updated.  If there is no fingerprint we assume
+   that this is okay. */
 static gpg_error_t
 check_against_given_fingerprint (app_t app, const char *fpr, int keyno)
 {