diff --git a/NEWS b/NEWS
index f0667eb5e..08703557b 100644
--- a/NEWS
+++ b/NEWS
@@ -15,13 +15,16 @@ Noteworthy changes in version 2.0.12 (not released)
  * Changed order of the confirmation questions for root certificates
    and stores negative answers in trustlist.txt.
 
- * Better synchronization of several smartcard sessions.
+ * Better synchronization of concurrent smartcard sessions.
 
- * Support for the Telesec Netkey 3 cards.
+ * Support 2048 bit OpenPGP cards.
+
+ * Support Telesec Netkey 3 cards.
 
  * The gpg-protect-tool now uses gpg-agent via libassuan.  Under
    Windows the Pinentry will now be put into the foreground.
 
+ 
 
 Noteworthy changes in version 2.0.11 (2009-03-03)
 -------------------------------------------------
diff --git a/doc/scdaemon.texi b/doc/scdaemon.texi
index 61671f441..c254868f2 100644
--- a/doc/scdaemon.texi
+++ b/doc/scdaemon.texi
@@ -670,7 +670,7 @@ command; i.e. to select another application.
 @subsection Send a verbatim APDU to the card.
 
 @example
-  APDU [--atr] [--more] [@var{hexstring}]
+  APDU [--atr] [--more] [--exlen[=@var{n}]] [@var{hexstring}]
 @end example
 
 
@@ -689,6 +689,10 @@ message before any data like this:
 Using the option @code{--more} handles the card status word MORE_DATA
 (61xx) and concatenate all reponses to one block.
 
+Using the option @code{--exlen} the returned APDU may use extended
+length up to N bytes.  If N is not given a default value is used
+(currently 4096).
+
 
 
 @mansect see also
diff --git a/po/be.po b/po/be.po
index af9989008..3d81d37dc 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -15,18 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -34,7 +34,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,44 +44,44 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "пароль занадта доўгі\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr ""
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "дрэнны MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "дрэнны пароль"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "дрэнны пароль"
@@ -91,22 +91,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr ""
@@ -149,7 +149,6 @@ msgstr ""
 "\n"
 
 #: agent/command-ssh.c:2346 agent/genkey.c:310 agent/genkey.c:432
-#: agent/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "Увядзіце пароль\n"
@@ -162,7 +161,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -222,13 +221,13 @@ msgstr ""
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -300,8 +299,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -405,7 +404,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -428,140 +427,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -578,52 +577,73 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Выбары:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "дрэнны пароль"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr ""
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "скасавана карыстальнікам\n"
 
+#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
+#, c-format
+msgid "error while asking for the passphrase: %s\n"
+msgstr ""
+
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -659,7 +679,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -669,21 +689,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "yes [так]"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -695,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -705,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -734,43 +754,43 @@ msgstr "дрэнны пароль"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -1155,7 +1175,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -1163,7 +1183,7 @@ msgstr ""
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
@@ -1466,18 +1486,18 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1756,24 +1776,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Загады:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1901,17 +1913,6 @@ msgstr ""
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Выбары:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr ""
@@ -2325,7 +2326,7 @@ msgstr ""
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
@@ -3030,12 +3031,12 @@ msgstr ""
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
@@ -3307,20 +3308,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr ""
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Ключ абаронены.\n"
 
@@ -3337,7 +3338,7 @@ msgstr ""
 "Увядзіце новы пароль для гэтага сакрэтнага ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 
@@ -4094,12 +4095,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr ""
@@ -4238,7 +4239,7 @@ msgstr ""
 msgid "rounded up to %u bits\n"
 msgstr ""
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4248,7 +4249,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4258,48 +4259,48 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr ""
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr ""
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr ""
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s ID ключа %08lX\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
 msgstr ""
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4310,7 +4311,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4320,44 +4321,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr ""
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr ""
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr ""
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr ""
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr ""
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr ""
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr ""
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr ""
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr ""
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4365,7 +4366,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4380,34 +4381,34 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4415,7 +4416,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4423,91 +4424,91 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr ""
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr ""
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr ""
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr ""
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr ""
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4567,45 +4568,45 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "немагчыма адкрыць \"%s\"\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: створаны зьвязак ключоў\n"
@@ -4651,7 +4652,7 @@ msgstr ""
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
@@ -4666,124 +4667,124 @@ msgstr "грамадскі ключ ня знойдзены"
 msgid "key not found on keyserver\n"
 msgstr "экспартаваць ключы на паслужнік ключоў"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "імпартаваць ключы з паслужніка ключоў"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "агульная памылка"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -5148,7 +5149,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr ""
@@ -5179,7 +5180,12 @@ msgstr "скасавана карыстальнікам\n"
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "непадтрымліваецца"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5189,12 +5195,12 @@ msgstr ""
 "Вам неабходна ўвесьці пароль, каб адчыніць сакрэтны ключ для\n"
 "карыстальніка: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бітавы %s ключ, ID %08lX, створаны %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6293,11 +6299,6 @@ 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"
@@ -6328,40 +6329,40 @@ msgstr "немагчыма адкрыць %s: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr ""
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "запіс у stdout\n"
@@ -6390,58 +6391,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -6461,15 +6472,15 @@ msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6499,7 +6510,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -6508,11 +6519,11 @@ msgstr "збой падпісаньня: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6534,113 +6545,103 @@ msgstr "Паўтарыце пароль\n"
 msgid "|A|Please enter the Admin PIN"
 msgstr "Паўтарыце пароль\n"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "%s: немагчыма стварыць хэш-табліцу: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "стварыць новую пару ключоў"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7462,21 +7463,21 @@ msgstr "%s: немагчыма стварыць тэчку: %s\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7498,7 +7499,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "паказаць ключы й адбіткі пальцаў"
@@ -7600,17 +7601,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 83f875ab1..7a4b46845 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -35,18 +35,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "no s'ha pogut emmagatzemar l'empremta digital: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -55,7 +55,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -65,45 +65,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "la línia és massa llarga\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "la contrasenya és massa llarga\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "l'MPI és erroni"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "la contrasenya és errònia"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "la contrasenya és errònia"
@@ -113,22 +113,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
@@ -171,7 +171,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "canvia la contrasenya"
@@ -184,7 +183,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -248,13 +247,13 @@ msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: error en escriure el registre de directoris: %s\n"
@@ -327,8 +326,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -437,7 +436,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -460,142 +459,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -612,55 +611,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcions:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "la contrasenya és errònia"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancel·la"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -697,7 +717,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -707,21 +727,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sí|si"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -733,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -743,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -772,43 +792,43 @@ msgstr "canvia la contrasenya"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "s'ha produït un error mentre s'escrivia l'anell secret «%s»: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -1227,7 +1247,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1238,7 +1258,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "parts de la clau secreta no estan disponbles\n"
@@ -1549,18 +1569,18 @@ msgstr "L'ordre no és vàlida (proveu «help»)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona per a aquesta ordre\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no s'ha pogut obrir «%s»\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1869,24 +1889,16 @@ msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "no hi ha una clau secreta per a la subclau pública %08lX - es descarta\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "s'usarà la clau secundària %08lX en lloc de la primària %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clau %08lX: clau secreta sense clau pública - es descarta\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Ordres:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -2017,17 +2029,6 @@ msgstr "|algo [fitxers]|imprimeix resums de missatges"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opcions:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea eixida amb armadura ascii"
@@ -2466,7 +2467,7 @@ msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
@@ -3203,12 +3204,12 @@ msgstr "error en crear l'anell «%s»: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "s'ha creat l'anell «%s»\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "no s'ha pogut reconstruir la memòria cau de l'anell: %s\n"
@@ -3524,20 +3525,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Aquesta clau no està protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "La clau està protegida.\n"
 
@@ -3554,7 +3555,7 @@ msgstr ""
 "Introduïu la nova contrasenya per a la clau secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "la contrasenya no s'ha repetit correctament; torneu a intentar-ho"
 
@@ -4386,12 +4387,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "la mida de la clau ha estat arrodonida fins a %u bits\n"
@@ -4531,7 +4532,7 @@ msgstr "La grandària sol·licitada és %u bits\n"
 msgid "rounded up to %u bits\n"
 msgstr "arrodonida fins a %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4547,7 +4548,7 @@ msgstr ""
 "      <n>m = la clau caduca als n mesos\n"
 "      <n>y = la clau caduca als n anys\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4563,42 +4564,42 @@ msgstr ""
 "      <n>m = la signatura caduca als n mesos\n"
 "      <n>y = la signatura caduca als n anys\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Indiqueu la validesa de la clau (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Indiqueu la validesa de la signatura (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "el valor no és vàlid\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s no caduca en absolut\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca el %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, 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:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4606,12 +4607,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "És correcte? (s/n)"
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4622,7 +4623,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4639,44 +4640,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nom i cognoms: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Hi ha un caràcter invàlid en el camp *nom*\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "El nom no pot començar amb un dígit\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 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:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Adreça electrònica: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "No és una adreça vàlida\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Comentari: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Hi ha un caràcter invàlid en el camp *comentari*\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Esteu usant el joc de caràcters `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4687,7 +4688,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4704,23 +4705,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:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoXx"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Corregiu l'error primer\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4728,12 +4729,12 @@ msgstr ""
 "Cal una contrasenya per a protegir la clau secreta.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4745,7 +4746,7 @@ msgstr ""
 "useu aquest programa amb l'opció \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4757,53 +4758,53 @@ msgstr ""
 "nombres primers; açò dóna oportunitat al generador de nombres aleatoris\n"
 "d'aconseguir prou entropia.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "La generació de claus ha estat cancel·lada.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "s'està escrivint la clau pública a «%s»\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, 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:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, 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:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, 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:3521
+#: g10/keygen.c:3525
 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:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4812,13 +4813,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, 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:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4827,7 +4828,7 @@ msgstr ""
 "amb el rellotge)\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4835,26 +4836,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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crear realment? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, 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:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4914,47 +4915,47 @@ msgstr "     Empremta digital ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVÍS: hi ha 2 fitxers amb informació confidencial.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s és el que no ha canviat\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s és el nou\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favor, solucioneu aquest possible problema de seguretat\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "s'està comprovant l'anell «%s»\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "s'han comprovat %lu claus (%lu signatures)\n"
 
 # Fitxer indi fins final.  Hau!  ivb
 # Grrr. Com em tracten els esclaus ja... jm
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s'ha creat l'anell\n"
@@ -5003,7 +5004,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
@@ -5018,127 +5019,127 @@ msgstr "no s'ha trobat la clau «%s»: %s\n"
 msgid "key not found on keyserver\n"
 msgstr "no s'ha trobat la clau «%s»: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s'està cercant «%s» al servidor HKP %s\n"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no es coneix cap servidor de claus (useu l'opció \"--keyserver\")\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "error de servidor de claus"
 
 # «del servidor», «en el servidor»?  ivb
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "error de servidor de claus"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: no és un ID vàlid\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "s'està sol·licitant la clau %08lX de %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVÍS: no s'ha pogut eliminar el fitxer temporal (%s) «%s»: %s\n"
@@ -5519,7 +5520,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID de la clau principal %08lX)"
@@ -5561,7 +5562,16 @@ msgstr "s'ha cancel·lat per l'usuari\n"
 msgid "problem with the agent: %s\n"
 msgstr "hi ha un problema amb l'agent: l'agent ha tornat 0x%lx\n"
 
-#: g10/passphrase.c:566
+# 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
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5571,12 +5581,12 @@ msgstr ""
 "Necessiteu la contrasenya per desblocar la clau secreta de\n"
 "l'usuari: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6779,15 +6789,6 @@ 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"
@@ -6818,40 +6819,40 @@ msgstr "no es pot obrir el fitxer: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "no s'ha trobat la clau pública %08lX: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
@@ -6880,58 +6881,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "canvia la contrasenya"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error en crear «%s»: %s\n"
@@ -6951,15 +6962,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6989,7 +7000,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
@@ -6998,11 +7009,11 @@ msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -7024,114 +7035,104 @@ msgstr "canvia la contrasenya"
 msgid "|A|Please enter the Admin PIN"
 msgstr "canvia la contrasenya"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Seleccioneu la raó de la revocació:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, 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:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "error: l'empremta digital és invàlida\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "«%s» ja està comprimida\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera un nou parell de claus"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "La generació de claus ha fallat: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr ""
@@ -7992,22 +7993,22 @@ msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
 # No em passe! ;)  ivb
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no s'ha pogut tancar «%s»: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -8030,7 +8031,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -8132,17 +8133,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "l'algoritme de protecció %d%s no està suportat\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "no s'ha pogut comprovar la signatura creada: %s\n"
diff --git a/po/cs.po b/po/cs.po
index fd15acc3e..c75843f71 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -15,18 +15,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "ulo�en� fingerprintu se nezda�ilo: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -35,7 +35,7 @@ msgstr "Pros
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "platnost: %s"
@@ -46,45 +46,45 @@ msgstr "platnost: %s"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "��dek je p��li� dlouh�"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "�patn� MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�patn� heslo"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "�patn� heslo"
@@ -94,22 +94,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
@@ -150,7 +150,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zm�nit heslo"
@@ -163,7 +162,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -226,13 +225,13 @@ msgstr "PIN nen
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: chyba p�i z�pisu adres��ov�ho z�znamu: %s\n"
@@ -305,8 +304,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zm�nit heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -413,7 +412,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -438,142 +437,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s mo�nostmi `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�tu mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvo�it `%s': %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adres�� `%s' vytvo�en\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) selhal v %s: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: p�esko�eno: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nen� v tomto sezen� dostupn�\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -590,55 +589,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Mo�nosti:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�patn� heslo"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "zru�eno"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -674,7 +694,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -684,21 +704,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -710,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -720,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -749,43 +769,43 @@ msgstr "zm
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otev��t podepsan� data '%s'\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba p�i z�sk�n� informac� o aktu�ln�m kl��i: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -1179,7 +1199,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1188,7 +1208,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajn� ��sti kl��e nejsou dostupn�\n"
@@ -1475,18 +1495,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nelze otev��t `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kl�� \"%s\" nenalezen: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1774,24 +1794,16 @@ msgstr "Neplatn
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajn� podkl�� pro ve�ejn� kl�� %s - ignorov�no\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��v�m podkl�� %s m�sto prim�rn�ho kl��e %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kl�� %s: tajn� kl�� bez kl��e ve�ejn�ho - p�esko�eno\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@P��kazy:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1919,17 +1931,6 @@ msgstr "|algo [soubory]  vypi
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Mo�nosti:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "vytvo� v�stup zak�dovan� pomoc� ASCII"
@@ -2373,7 +2374,7 @@ msgstr "
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
@@ -3091,12 +3092,12 @@ msgstr "chyba p
 msgid "keyring `%s' created\n"
 msgstr "soubor kl��� (keyring) `%s' vytvo�en\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "zdroj bloku kl��e `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "selhalo obnoven� vyrovn�vac� pam�ti kl���: %s\n"
@@ -3394,19 +3395,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Tento kl�� nen� chr�n�n�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Kl�� je chr�n�n�.\n"
 
@@ -3423,7 +3424,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pro tento tajn� kl��.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nen� zopakov�no spr�vn�; zkuste to znovu"
 
@@ -4180,12 +4181,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�lka kl��e zaokrouhlena na %u bit�\n"
@@ -4323,7 +4324,7 @@ msgstr "Po
 msgid "rounded up to %u bits\n"
 msgstr "zaokrouhleno na %u bit�\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4339,7 +4340,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:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4355,38 +4356,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:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Kl�� je platn� pro? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� pro? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Platnost kl��e nikdy neskon��\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Platnost podpisu nikdy neskon��\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Platnost kl��e skon�� v %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnost podpisu skon�� v %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4394,11 +4395,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vn� (a/N)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4409,7 +4410,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4425,44 +4426,44 @@ msgstr ""
 "    \"Magda Prochazkova (student) <magda@domena.cz>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Jm�no a p��jmen�: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve jm�n�\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Jm�no nem��e za��nat ��slic�\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Jm�no mus� b�t dlouh� alespo� 5 znak�\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Koment��: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment��i\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��v�te znakovou sadu `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4473,7 +4474,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4488,25 +4489,25 @@ msgstr "Do pole jm
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "jJkKeEPpUu"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Nejd��v, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4514,12 +4515,12 @@ msgstr ""
 "Pro ochranu Va�eho tajn�ho kl��e mus�te zadat heslo.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4531,7 +4532,7 @@ msgstr ""
 "tohoto programu s parametrem \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4544,50 +4545,50 @@ msgstr ""
 "pou��vat disky); d�ky tomu m� gener�tor lep�� �anci z�skat dostatek "
 "entropie.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Vytv��en� kl��e bylo zru�eno.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuji ve�ejn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor ve�ejn�ch kl��� (pubring): %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "nenalezen zapisovateln� soubor tajn�ch kl��� (secring): %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, 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:3521
+#: g10/keygen.c:3525
 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:3532
+#: g10/keygen.c:3536
 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"
@@ -4595,12 +4596,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvo�en� kl��e se nepoda�ilo: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4608,7 +4609,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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4616,25 +4617,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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Opravdu vytvo�it? (a/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, 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:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nemohu vytvo�it z�lohu souboru `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, 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"
@@ -4693,45 +4694,45 @@ msgstr "      Fingerprint kl
 msgid "      Card serial no. ="
 msgstr "      Seriov� ��slo karty ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROV�N�: Existuj� dva soubory s tajn�mi informacemi.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je beze zm�ny\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cache souboru kl��� `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kl��� ji� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kl��� ulo�eno v cache (%lu podpis�)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: soubor kl��� (keyring) vytvo�en\n"
@@ -4778,7 +4779,7 @@ msgstr "disabled"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Vlo�te ��slo (��sla), 'N' pro dal�� nebo 'Q' pro konec> "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� protokol serveru kl��� (us %d!=handler %d)\n"
@@ -4792,121 +4793,121 @@ msgstr "kl
 msgid "key not found on keyserver\n"
 msgstr "kl�� nebyl na serveru kl��� nalezen\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�aduji kl�� %s ze %s server %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�aduji kl�� %s z %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "pos�l�m kl�� %s na %s server %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "pos�l�m kl�� %s na %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyhled�v�m \"%s\" na %s serveru %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyhled�v�m \"%s\" na serveru %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "��dn� operace se serverem kl���!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VAROV�N�: keyserver handler z jin� verze GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "server kl��� neposlal VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "�adn� server kl��� nen� zn�m (pou��jte volbu --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "vol�n� extern�ho keyserver nen� v t�to verzi podporov�no\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "protokol serveru kl��� `%s' nen� podporov�n\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "akce `%s' nen� podporov�na v protokolu `%s' serveru kl���\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nepodporuje protokol verze  %d\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "�asov� limit pro server kl��� vypr�el\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "intern� chyba serveru kl���\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "chyba komunikace se serverem kl���: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nen� ID kl��e: p�esko�eno\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "aktualizuji 1 kl�� z %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "aktualizuji %d kl��� z %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROV�N�: nelze aktualizovat kl�� %s prost�ednictv�m %s: %s\n"
@@ -5275,7 +5276,7 @@ msgstr "VAROV
 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:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(hlavn� ID kl��e %s)"
@@ -5306,7 +5307,12 @@ msgstr "zru
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentem - pou��v�n� agenta vypnuto\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nen� vy�adov�no"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5315,12 +5321,12 @@ msgstr ""
 "Mus�te zn�t heslo, abyste odemknul(a) tajn� kl�� pro\n"
 "u�ivatele: \"%s\"\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podkl�� na hlavn�m kl��i ID %s)"
@@ -6471,11 +6477,6 @@ 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"
@@ -6506,40 +6507,40 @@ msgstr "podeps
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�ejmenov�n� `%s' na `%s' se nezda�ilo: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "nemohu vytvo�it adres�� `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "chyba p�i z�pisu souboru kl��� (keyring)  `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "ve�ejn� kl�� %s nebyl nalezen: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "zapisuji tajn� kl�� do `%s'\n"
@@ -6570,58 +6571,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "funkce PIN callback zkon�ila chybou: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 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"
@@ -6641,15 +6652,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr "odpov�� neobsahuje RSA modulus\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpov�� neobsahuje ve�ejn� RSA exponent\n"
 
@@ -6679,7 +6690,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verifikace CHV%d se nezda�ila: %s\n"
@@ -6688,11 +6699,11 @@ msgstr "verifikace CHV%d se nezda
 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:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "karta je trvale uzam�ena!\n"
 
@@ -6715,111 +6726,101 @@ msgstr "||Pros
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Pros�m vlo�te PIN%%0A[podpis hotov: %lu]"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nov� PIN administr�tora"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Nov� PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "chyba p�i �ten� aplika�n�ch dat\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "chyba p�i �ten� fingerpritnu DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "kl�� ji� existuje\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "existuj�c� kl�� bude p�eps�n\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "generov�n� nov�ho kl��e\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "chyb� �asov� raz�tko vytvo�en�\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "sch�z� RSA modulus nebo nem� velikost %d bit�\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "sch�z� ve�ejn� RSA exponent nebo je del�� ne� %d bit�\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nelze ulo�it kl��: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "pros�m po�kejte ne� bude kl�� vygenerov�n ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "henerov�n� kl��e se nezda�ilo\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generov�n� kl��e dokon�eno (%d sekund)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "neplatn� struktura OpenPGP kraty (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "podpis %s, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dosud vytvo�en� podpisy: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "p��stup na %s se nezda�il - vadn� OpenPGP karta?\n"
@@ -7653,21 +7654,21 @@ msgstr "nelze zpracovat URL serveru kl
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nemohu otev��t `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7690,7 +7691,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba p�i vytv��en� hesla: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba p�i �ten� `%s': %s\n"
@@ -7792,17 +7793,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "ochrann� algoritmus %d%s nen� podporov�n\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvo�en�ho podpisu se nepoda�ila: %s\n"
diff --git a/po/da.po b/po/da.po
index 3f862dd68..42ba41732 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 # er det klogt at overs�tte TrustDB?
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,7 +36,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -46,43 +46,43 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr ""
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr ""
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "d�rlig mpi"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "d�rlig kodes�tning"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "d�rlig kodes�tning"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ndr kodes�tningen"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -226,13 +225,13 @@ msgstr "kodes
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "skriver til `%s'\n"
@@ -305,8 +304,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -413,7 +412,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -436,140 +435,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,51 +585,72 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Indstillinger:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "d�rlig kodes�tning"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr ""
+
+#: agent/protect-tool.c:1178 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/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr ""
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -666,7 +686,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -676,21 +696,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -702,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -712,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -741,43 +761,43 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -1167,7 +1187,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
 
@@ -1175,7 +1195,7 @@ msgstr ""
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "hemmelig n�gle ikke tilg�ngelig"
@@ -1488,18 +1508,18 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �bne `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1779,24 +1799,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruger sekund�r n�gle %08lX istedetfor prim�r n�gle %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Kommandoer:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1929,17 +1941,6 @@ msgstr "|algo [filer]|print meddelelsesresum
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Indstillinger:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "opret ascii beskyttet uddata"
@@ -2362,7 +2363,7 @@ msgstr ""
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
@@ -3085,12 +3086,12 @@ msgstr "fejl ved skrivning af n
 msgid "keyring `%s' created\n"
 msgstr ""
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
@@ -3368,21 +3369,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "N�glen er beskyttet.\n"
 
@@ -3397,7 +3398,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "kodes�tningen blev ikke ordentlig gentaget; pr�v igen.\n"
@@ -4193,12 +4194,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
@@ -4338,7 +4339,7 @@ msgstr "
 msgid "rounded up to %u bits\n"
 msgstr "rundet op til %u bit\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4348,7 +4349,7 @@ msgid ""
 "      <n>y = key expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4358,52 +4359,52 @@ msgid ""
 "      <n>y = signature expires in n years\n"
 msgstr ""
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "N�gle er gyldig for? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "ugyldig v�rdi\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "N�glen udl�ber aldrig\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4414,7 +4415,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4424,44 +4425,44 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Rigtige navn: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Ugyldige bogstaver i navn\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Navn m� ikke starte med et tal\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navn skal v�re mindst 5 bogstaver langt\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Ugyldigt tegn i kommentar\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruger '%s' tegns�ttet.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4472,7 +4473,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4487,24 +4488,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 #, 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4512,12 +4513,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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 +4526,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4533,92 +4534,92 @@ msgid ""
 "generator a better chance to gain enough entropy.\n"
 msgstr ""
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�gle oprettet og signeret.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr ""
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "hemmelige n�gler import: %lu\n"
@@ -4684,45 +4685,45 @@ msgstr "             Fingeraftryk:"
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "vis n�gler og signaturer"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
@@ -4770,7 +4771,7 @@ msgstr "sl
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ugyldig n�glering"
@@ -4785,124 +4786,124 @@ msgstr "%s: bruger ikke fundet: %s\n"
 msgid "key not found on keyserver\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "ugyldig n�glering"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "generel fejl"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -5272,7 +5273,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�gle-ID %08lX)"
@@ -5303,7 +5304,12 @@ msgstr ""
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ikke bearbejdet"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5312,12 +5318,12 @@ msgstr ""
 "Du skal bruge en kodes�tning til at beskytte din hemmelige n�gle.\n"
 "\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr ""
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6448,11 +6454,6 @@ 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"
@@ -6483,40 +6484,40 @@ msgstr "kan ikke 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "offentlig n�gle ikke fundet"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
@@ -6545,58 +6546,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
@@ -6617,15 +6628,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6655,7 +6666,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
@@ -6664,11 +6675,11 @@ msgstr "p
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6690,115 +6701,105 @@ msgstr "
 msgid "|A|Please enter the Admin PIN"
 msgstr "�ndr kodes�tningen"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "rev- forkert n�gletilbagekald\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "fejl i trailerlinie\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gener�r et nyt n�glepar"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "N�gleoprettelse annulleret.\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
@@ -7630,21 +7631,21 @@ msgstr "import
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7667,7 +7668,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -7771,17 +7772,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "valgte cifferalgoritme %d er ugyldig\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Kan ikke tjekke signatur: %s\n"
diff --git a/po/de.po b/po/de.po
index 2a81f7ddb..e2821b225 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
-# GnuPG german translation
+# GnuPG German translation
 # Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-#               2006, 2007, 2008 Free Software Foundation, Inc.
+#               2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 # Walter Koch <koch@u32.de>, 1998, 1999, 2000, 2001, 2002, 
 #               2003, 2004, 2005, 2006
 # Merged with the gnupg 1.9.23 translation by Werner Koch on 2006-09-25.
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.10\n"
 "Report-Msgid-Bugs-To: translations@gnupg.org\n"
-"POT-Creation-Date: 2009-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+0200\n"
 "PO-Revision-Date: 2009-03-24 18:54+0100\n"
 "Last-Translator: Walter Koch <koch@u32.de>\n"
 "Language-Team: German <de@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 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:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -31,7 +31,7 @@ msgstr ""
 "Bitte geben Sie Ihre PIN ein, so daß der geheime Schlüssel benutzt werden "
 "kann"
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -41,7 +41,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr "Qualität:"
 
@@ -51,43 +51,43 @@ msgstr "Qualität:"
 #. 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:657
+#: 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:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (Versuch %d von %d)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "Die PIN ist zu lang"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "Das Mantra (Passphrase) ist zu lang"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "Ungültige Zeichen in der PIN"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "Die PIN ist zu kurz"
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 msgid "Bad PIN"
 msgstr "Falsche PIN"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 msgid "Bad Passphrase"
 msgstr "Falsche Passphrase"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "Passphrase"
 
@@ -96,22 +96,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
@@ -152,7 +152,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "Bitte geben Sie die Passphrase noch einmal ein:"
 
@@ -166,7 +165,7 @@ msgstr ""
 "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/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "Keine Übereinstimmung - bitte nochmal versuchen"
 
@@ -223,13 +222,13 @@ msgstr "PIN wurde nicht richtig wiederholt; noch einmal versuchen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Bitte geben Sie die PIN%s%s%s ein um die Karte zu entsperren"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "Fehler beim Erstellen einer temporären Datei: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "Fehler beim Schreiben auf eine temporäre Datei: %s\n"
@@ -314,8 +313,8 @@ 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 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -415,7 +414,7 @@ msgstr "Die ssh-agent-Emulation anschalten"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariabeln auf DATEI"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 msgid "Please report bugs to <"
@@ -438,139 +437,139 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, 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:1749
+#: agent/gpg-agent.c:1752
 #, 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:1769
+#: agent/gpg-agent.c:1772
 #, 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:1774
+#: agent/gpg-agent.c:1777
 #, 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:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -588,11 +587,32 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [Optionen] KEYGRIP\n"
 "Kennwortpuffer-Pflege\n"
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Optionen:\n"
+" "
+
+#: agent/protect-tool.c:162
 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -600,16 +620,16 @@ msgstr ""
 "Syntax: gpg-protect-tool [Optionen] [Argumente]\n"
 "Werkzeug zum Bearbeiten von geheimen Schlüsseln\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 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:1199
+#: agent/protect-tool.c:1155
 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -617,7 +637,7 @@ msgstr ""
 "Bitte geben Sie die Passphrase ein, um das importierte Objekt im GnuPG "
 "System zu schützen."
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -625,19 +645,19 @@ msgstr ""
 "Die Eingabe der Passphrase bzw. der PIN\n"
 "wird benötigt um diese Aktion auszuführen."
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Passphrase:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "Vom Benutzer abgebrochen\n"
+
+#: agent/protect-tool.c:1178 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/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "Vom Benutzer abgebrochen\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -676,7 +696,7 @@ msgstr "Ungültiger Schlüsselflag in `%s', Zeile %d\n"
 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:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 
@@ -686,9 +706,9 @@ msgstr "Fehler beim Lesen der Liste vertrauenswürdiger root-Zertifikate\n"
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -697,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:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "Nein"
 
@@ -713,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -725,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr "Falsch"
 
@@ -757,43 +777,43 @@ msgstr "Die Passphrase ändern"
 msgid "I'll change it later"
 msgstr "Ich werde sie später ändern"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "Feler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@ -1165,7 +1185,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1173,7 +1193,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr "Der Rückstellcode ist nicht vorhanden\n"
 
@@ -1461,18 +1481,18 @@ msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output funktioniert nicht bei diesem Befehl\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "'%s' kann nicht geöffnet werden\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "Schlüssel \"%s\" nicht gefunden: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1769,25 +1789,17 @@ msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Kein privater Unterschlüssel zum öffentlichen Unterschlüssel %s - ignoriert\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "der Unterschlüssel %s wird anstelle des Hauptschlüssels %s verwendet\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 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:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Befehle:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 msgid "make a signature"
 msgstr "Eine Unterschrift erzeugen"
@@ -1912,17 +1924,6 @@ msgstr "Hashwerte für die Dateien ausgeben"
 msgid "run in server mode"
 msgstr "Im Server Modus ausführen"
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Optionen:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "Ausgabe mit ASCII-Hülle versehen"
@@ -2355,7 +2356,7 @@ msgstr ""
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
@@ -3085,12 +3086,12 @@ msgstr "Fehler beim Erzeugen des Schlüsselbundes `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "Schlüsselbund `%s' erstellt\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Schlüsselblockhilfsmittel`%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Schlüsselbund-Cache konnte nicht neu erzeugt werden: %s\n"
@@ -3393,19 +3394,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Dieser Schlüssel ist nicht geschützt.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Geheime Teile des Haupschlüssels sind nicht vorhanden\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Geheime Teile des Haupschlüssels sind auf der Karte gespeichert.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Schlüssel ist geschützt.\n"
 
@@ -3422,7 +3423,7 @@ msgstr ""
 "Geben Sie die neue Passphrase für diesen geheimen Schlüssel ein.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "Passphrase wurde nicht richtig wiederholt; noch einmal versuchen"
 
@@ -4195,12 +4196,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Schlüssellänge auf %u Bit aufgerundet\n"
@@ -4340,7 +4341,7 @@ msgstr "Die verlangte Schlüssellänge beträgt %u Bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "aufgerundet auf %u Bit\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4356,7 +4357,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:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4372,38 +4373,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:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Wie lange bleibt der Schlüssel gültig? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Wie lange bleibt die Beglaubigung gültig? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "Ungültiger Wert.\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Schlüssel verfällt nie\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Signature verfällt nie\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Key verfällt am %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Unterschrift verfällt am %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4411,11 +4412,11 @@ msgstr ""
 "Ihr Rechner kann Daten jenseits des Jahres 2038 nicht anzeigen.\n"
 "Trotzdem werden Daten bis 2106 korrekt verarbeitet.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Ist dies richtig? (j/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4429,7 +4430,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4445,44 +4446,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Ihr Name (\"Vorname Nachname\"): "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Ungültiges Zeichen im Namen\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Der Name darf nicht mit einer Ziffer beginnen.\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Der Name muß min. 5 Zeichen lang sein.\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Email-Adresse: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Diese Email-Adresse ist ungültig\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Ungültiges Zeichen im Kommentar.\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Sie benutzen den Zeichensatz `%s'\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4493,7 +4494,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4508,23 +4509,23 @@ msgstr "Bitte keine Emailadressen als Namen oder Kommentar verwenden\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeFfBb"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Bitte beseitigen Sie zuerst den Fehler\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4532,12 +4533,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu schützen.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4550,7 +4551,7 @@ msgstr ""
 "aufrufen.\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4561,50 +4562,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Schlüsselerzeugung abgebrochen.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "schreiben des öffentlichen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "schreiben des geheimen Schlüssel-\"stub\"s nach `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "schreiben des geheimen Schlüssels nach '%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kein schreibbarer öffentlicher Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kein schreibbarer geheimer Schlüsselbund gefunden: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des öff. Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des geheimen Schlüsselbundes `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "Öffentlichen und geheimen Schlüssel erzeugt und signiert.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4613,12 +4614,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4626,7 +4627,7 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunde in der Zukunft erzeugt (Zeitreise oder Uhren "
 "stimmen nicht überein)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4634,25 +4635,25 @@ msgstr ""
 "Der Schlüssel wurde %lu Sekunden in der Zukunft erzeugt (Zeitreise oder "
 "Uhren stimmen nicht überein)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "HINWEIS: Unterschlüssel für v3-Schlüssen sind nicht OpenPGP-konform\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Wirklich erzeugen? (j/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, 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:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "Sicherungsdatei '%s' kann nicht erzeugt werden: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "Hinweis: Sicherung des Kartenschlüssels wurde auf `%s' gespeichert\n"
@@ -4711,45 +4712,45 @@ msgstr "  Schl.-Fingerabdruck ="
 msgid "      Card serial no. ="
 msgstr "      Kartenseriennr. ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "umbenennen von `%s' nach `%s' schlug fehl: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "Warnung: Zwei Dateien mit vertraulichem Inhalt vorhanden.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ist der Unveränderte\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ist der Neue\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Bitte diesen potentiellen Sicherheitsmangel beseitigen\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Puffern des Schlüsselbundes `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu Schlüssel bislang gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu Schlüssel gepuffert (%lu Beglaubigungen)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Schlüsselbund erstellt\n"
@@ -4800,7 +4801,7 @@ msgstr "abgeschaltet"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Eingabe von Nummern, Nächste (N) oder Abbrechen (Q) > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "Ungültiges Schlüsselserverprotokoll (wir %d!=Handhabungsroutine %d)\n"
@@ -4814,124 +4815,124 @@ msgstr "Schlüssel \"%s\" wurde auf dem Schlüsselserver nicht gefunden\n"
 msgid "key not found on keyserver\n"
 msgstr "Schlüssel wurde auf dem Schlüsselserver nicht gefunden\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "fordere Schlüssel %s von %s-Server %s an\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "fordere Schlüssel %s von %s an\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "suche Namen auf %s-Server %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "suche Namen auf %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "sende Schlüssel %s auf den %s-Server %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "sende Schlüssel %s auf %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "suche nach \"%s\" auf %s-Server %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "suche nach \"%s\" auf %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "Kein Schlüsselserver-Vorgang\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "WARNUNG: Die Schlüsselserver-Handhabungsroutine stammt von einer anderen "
 "GnuPG-Version (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "Schlüsselserver sendete VERSION nicht\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "Kein Schlüsselserver bekannt (Option --keyserver verwenden)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "Externe Schlüsselserveraufrufe werden in diesem \"Build\" nicht unterstützt\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "Keine Handhabungsroutine für Schlüsselserverschema `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "Vorgang `%s' wird vom Schlüsselserverschema `%s' nicht unterstützt\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s unterstützt Hilfsroutinenversion %d nicht\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "Schlüsselserver-Zeitüberschreitung\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "interner Fehler Schlüsselserver\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Schlüsselserver-Datenübertragunsfehler: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" ist keine Schlüssel-ID: überspringe\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "WARNUNG: Schlüssel %s kann per %s nicht aktualisiert werden: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "ein Schlüssel wird per %s aktualisiert\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d Schlüssel werden per %s aktualisiert\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "WARNUNG: die URI %s kann nicht geholt werden: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "WARNUNG: die URI %s kann nicht analysiert werden\n"
@@ -5303,7 +5304,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (Hauptschlüssel-ID %s)"
@@ -5335,7 +5336,11 @@ msgstr "Abbruch durch Benutzer\n"
 msgid "problem with the agent: %s\n"
 msgstr "Problem mit dem Agenten: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "Nicht genügend Speicher\n"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5344,12 +5349,12 @@ msgstr ""
 "Sie benötigen eine Passphrase, um den geheimen Schlüssel zu entsperren.\n"
 "Benutzer: \"%s\"\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-Bit %s Schlüssel, ID %s, erzeugt %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (Unterschlüssel aus Hauptschlüssel-ID %s)"
@@ -6530,10 +6535,6 @@ 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"
@@ -6564,40 +6565,40 @@ msgstr "iconv_open fehlgeschlagen: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "Umwandlung von `%s' in `%s' schlug fehl: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "Die temporäre Datei `%s' kann nicht erstellt werden: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "Fehler beim Schreiben von %s: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "eine übriggebliebene Sperrdatei wird entfernt (erzeugt von %d)\n"
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr " - existiert wahrscheinlich nicht mehr - entferne Sperre"
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "warte auf die Freigabe der Sperre (gehalten von %d%s) %s...\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr "(Deadlock?) "
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "Dateisperre %s konnte nicht eingerichtet werden: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "Warten auf die Freigabe der Dateisperre `%s' ...\n"
@@ -6626,49 +6627,59 @@ msgstr ""
 "Syntax: kbxutil [Optionen] [Dateien]\n"
 "Anlistem exportieren und Importieren von KeyBox Dateien\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-Callback meldete Fehler: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "Die Nullpin wurde noch nicht geändert\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|Bitte eine neue PIN für den Standard-Schlüssel eingeben."
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Bitte die PIN für den Standard-Schlüssel eingeben."
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Standard-"
 "Schlüssel ein."
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr ""
 "|P|Bitte geben Sie den PIN Entsperrcode (PUK) für den Standard-Schlüssel ein."
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 "|N|Bitte geben Sie eine neue PIN für den Schlüssel zur Erstellung "
 "qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 "||Bitte geben Sie die PIN für den Schlüssel zur Erstellung qualifizierter "
 "Signaturen ein."
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -6676,7 +6687,7 @@ msgstr ""
 "|NP|Bitte geben Sie einen neuen PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
@@ -6684,7 +6695,7 @@ msgstr ""
 "|N|Bitte geben Sie den PIN Entsperrcode (PUK) für den Schlüssel zur "
 "Erstellung qualifizierter Signaturen ein."
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Fehler beim Abfragen einer neuen PIN: %s\n"
@@ -6704,15 +6715,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "Antwort enthält den öffentlichen RSA-Exponenten nicht\n"
 
@@ -6743,7 +6754,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
@@ -6752,11 +6763,11 @@ msgstr "Prüfung des CHV%d fehlgeschlagen: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "Zugriff auf Admin-Befehle ist nicht eingerichtet\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "Karte ist dauerhaft gesperrt!\n"
 
@@ -6777,110 +6788,100 @@ msgstr "|A|Bitte die Admin-PIN eingeben.%%0A[Verbliebene Versuche: %d]"
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|Bitte die Admin-PIN eingeben."
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 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:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr "|RN|Neuer Rückstellcode"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Neue Admin-PIN"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Neue PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "Fehler beim Lesen der Anwendungsdaten\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "Fehler beim Lesen des Fingerabdrucks DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "Schlüssel existiert bereits\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "Existierender Schlüssel wird ersetzt werden\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "neue Schlüssel werden erzeugt\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "Erzeugungsdatum fehlt\n"
 
-#: scd/app-openpgp.c:2371
-#, 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-openpgp.c:2383
-#, 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-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "Speichern des Schlüssels fehlgeschlagen: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "Bitte warten, der Schlüssel wird erzeugt ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "Schlüsselerzeugung fehlgeschlagen\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Schlüsselerzeugung abgeschlossen (%d Sekunden)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "Ungültige Struktur der OpenPGP-Karte (DO 0x93)}\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 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:2794
+#: scd/app-openpgp.c:2824
 #, 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:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "Anzahl bereits erzeugter Signaturen: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "Die Überprüfung der Admin PIN is momentan durch einen Befehl verboten "
 "worden\n"
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Kann auf %s nicht zugreifen - ungültige OpenPGP-Karte?\n"
@@ -7690,21 +7691,21 @@ msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 msgid "WARNING: running with faked system time: "
 msgstr "WARNUNG: Ausführung mit gefälschter Systemzeit: "
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "Importiere allgemeine Zertifikate: %s\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "Signieren mit `%s' nicht möglich: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr "Dieser Befehl wurde noch nicht implementiert\n"
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr "Ungültiger Befehl (Es gibt keinen implizierten Befehl)\n"
 
@@ -7726,7 +7727,7 @@ msgstr "Grundlegende Zertifikatprüfungen fehlgeschlagen - nicht importiert\n"
 msgid "error importing certificate: %s\n"
 msgstr "Fehler beim Importieren des Zertifikats: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "Fehler beim Lesen der Eingabe: %s\n"
@@ -7840,19 +7841,19 @@ msgstr ""
 "zu erzeugen. Bitte beachten Sie, daß dies KEINE qualifizierte\n"
 "Signatur erzeugen wird."
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "Hashverfahren %d (%s) wird für Unterzeichner %d nicht unterstützt; %s wird "
 "benutzt\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "Benutztes Hashverfahren für Unterzeichner %d: %s (%s)\n"
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Prüfung auf ein qualifiziertes Zertifikats fehlgeschlagen: %s\n"
diff --git a/po/el.po b/po/el.po
index 48fcc88b8..54b76670b 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-7\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -34,7 +34,7 @@ msgstr "
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,45 +44,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "� ����� ������ ����� ���� ������\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "���� MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "���� ����� ������"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "���� ����� ������"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "������ ��� ������ ������"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -224,13 +223,13 @@ msgstr "
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "������� ���  `%s'\n"
@@ -303,8 +302,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -412,7 +411,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -435,142 +434,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,55 +586,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"��������:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�������������� �� ����� �����߷ ���� ����� ��� ������� ������� \n"
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "���� ����� ������"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "������ ��� ���������� ��� ������ ������: %s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "�������"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -671,7 +691,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -681,21 +701,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "���|���"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -707,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -717,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -746,43 +766,43 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -1179,7 +1199,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
 msgstr "��� ������ �� ����� ���� �� ��������� ������ (batchmode)\n"
@@ -1189,7 +1209,7 @@ msgstr "
 msgid "This command is only available for version 2 cards\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "������� ��� �������� �������� ��� ����� ���������\n"
@@ -1501,18 +1521,18 @@ msgstr "
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "�������� ��������� ��� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1817,24 +1837,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����� ��� ������������� �������� %08lX ���� ��� ����������� %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "������ %08lX: ������� ������ ����� ������� - ������������\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@�������:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1963,17 +1975,6 @@ msgstr "|
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"��������:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "���������� ascii ������������ ������"
@@ -2403,7 +2404,7 @@ msgstr ""
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
@@ -3135,12 +3136,12 @@ msgstr "
 msgid "keyring `%s' created\n"
 msgstr "���������� `%s' �������������\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "������ ���� �� ���������� ��� `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "�������� ������������ ��� cache �����������: %s\n"
@@ -3459,20 +3460,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "���� �� ������ ��� �������������.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "������� ������� ��� ������ �������� ��� ����� ���������.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "�� ������ �������������.\n"
 
@@ -3489,7 +3490,7 @@ msgstr ""
 "�������������� ��� ��� ����� ������ ��� ���� �� ������� ������.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "� ����� ������ ��� ������������ �����. ��������� ����"
 
@@ -4301,12 +4302,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��������������� ��� ������� �������� ��� %u bits\n"
@@ -4446,7 +4447,7 @@ msgstr "
 msgid "rounded up to %u bits\n"
 msgstr "����������������� ��� �� %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4462,7 +4463,7 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4478,40 +4479,40 @@ msgstr ""
 "      <n>m = �� ������ ����� �� n �����\n"
 "      <n>y = �� ������ ����� �� n ���\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "�� ������ ����� ������ ���; (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "� �������� ����� ������ ���; (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "�� ������ ����\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "�� %s ��� ����� ����\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "�� %s ����� ���� %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�������� ����� ���� %s.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4519,12 +4520,12 @@ msgstr ""
 "�� ������� ��� ��� ������ �� ����������� ����������� ���� ��� 2038.\n"
 "����, �� ����������� ����� ��� �� 2106.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "����� ���� ����� (y/n); "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4535,7 +4536,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4552,44 +4553,44 @@ msgstr ""
 "    \"Nikolaoy Nikos (toy Ioanni) <nikoln@athens.gr>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "������� �����: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "�� ������� ���������� ��� �����\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "�� ����� ��� ����������� �� ������ �� ���������� �����\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "�� ����� ������ �� ���� ����������� 5 ����������\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "��������� Email: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "�� ������ ��������� Email\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "�� ������� ���������� ��� ������\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "�������������� �� `%s' ��� ����������.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4600,7 +4601,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�������� ��� ����������� ��� ��������� email ��� ����� � ��� ������\n"
 
@@ -4615,23 +4616,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (Q)�����������; "
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "������ (N)�����, (C)������, (E)mail � (O)�������/(Q)�����������; "
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "��������, ��������� ����� �� ������\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4639,12 +4640,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������� �� ������� ������.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4656,7 +4657,7 @@ msgstr ""
 "����� ������, �� ��� ������� \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4668,50 +4669,50 @@ msgstr ""
 "���� �������) ���� �� �������� ����������� ������ �������. ���� �����\n"
 "��� ��������� ������� ������� ��� �������� �� ������� ������ ��������.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "� ���������� �������� ����������.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "�� ������� ��������� ������� ����������: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "�� ������� ��� �� ������� ������ �������������� ��� �����������.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4722,12 +4723,12 @@ msgstr ""
 "�������� �� ��������������� ��� ������ \"--edit-key\" ��� �� ������������\n"
 "��� ���������� ������ ��� ���� �� ����.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4735,7 +4736,7 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4743,28 +4744,28 @@ msgstr ""
 "�� ������ ������������� %lu ������������ ��� ������ (��������� �\n"
 "����� �������� ��� �����)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 "��������: � ���������� ����������� ��� ������� v3 ��� ����� �������\n"
 "�� �� OpenPGP\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "������� �� ������������; "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "��������: �� ������� ������ %08lX ����� ���� %s\n"
@@ -4824,45 +4825,45 @@ msgstr "     
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�������������: 2 ������ �� ������������� ����������� ��������.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ����� �� ����������\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s ����� �� ���\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "�������� ��������� ���� ��� ������ \"�����\" ���������\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "������� ����������� `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ������� ����� �������� (%lu ���������)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���������� �������������\n"
@@ -4911,7 +4912,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�� ������� �������� ��������\n"
@@ -4926,126 +4927,126 @@ msgstr "
 msgid "key not found on keyserver\n"
 msgstr "�� ������ '%s' �� �������: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "����������� �� �� ������ ��� %08lX ���� %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��������� ��� \"%s\" ��� �� HKP ���������� %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "������ ���������� ��������"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "������ �������� %08lX ��� �� %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�������������: �������� ��������� tempfile (%s) `%s': %s\n"
@@ -5417,7 +5418,7 @@ msgstr "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (����� ������, ID %08lX)"
@@ -5449,7 +5450,12 @@ msgstr "
 msgid "problem with the agent: %s\n"
 msgstr "�������� �� ��� agent: agent ���������� 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "�� �������������"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5459,12 +5465,12 @@ msgstr ""
 "���������� ��� ����� ������ ��� �� ������������ �� ������� ������\n"
 "��� �� ������: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s ������, ID %08lX, ���������� %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6646,11 +6652,6 @@ 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"
@@ -6681,40 +6682,40 @@ msgstr "
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "�� ������� ������ %08lX ��� �������: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
@@ -6743,58 +6744,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "������ ��� ������ ������"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "������ ��� ������ ������"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
@@ -6814,15 +6825,15 @@ msgstr "
 msgid "reading public key failed: %s\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6852,7 +6863,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
@@ -6861,11 +6872,11 @@ msgstr "keyserver 
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6887,114 +6898,104 @@ msgstr "
 msgid "|A|Please enter the Admin PIN"
 msgstr "������ ��� ������ ������"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "�������� �������� ��� ����� ��� ��� ��������:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "������ ���� ��� �������� ��� ����� ��������: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: ������ ���� �������� ��� �������� free : %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' ��� �����������\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "���������� ���� ���� ������� ��������"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "�������� block �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "� ���������� �������� �������: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
@@ -7829,21 +7830,21 @@ msgstr "
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "�������� ����������� ��� `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7866,7 +7867,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -7968,17 +7969,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "��� ������������� � ���������� ���������� %d%s\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "������� � ������� ��� ��������� ��� �������������: %s\n"
diff --git a/po/eo.po b/po/eo.po
index b0ec0344c..c4d9da71b 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-3\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -34,7 +34,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,45 +44,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "pasfrazo estas tro longa\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nevalida signo en nomo\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "malbona MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "malbona pasfrazo"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "malbona pasfrazo"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�an�i la pasfrazon"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -225,13 +224,13 @@ msgstr "la pasfrazo ne estis 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "skribas al '%s'\n"
@@ -304,8 +303,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -412,7 +411,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -435,142 +434,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,55 +586,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcioj:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "malbona pasfrazo"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "nuligita de uzanto\n"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -671,7 +691,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -681,21 +701,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jes"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -707,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -717,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -746,43 +766,43 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -1186,7 +1206,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1196,7 +1216,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "sekretaj �losilpartoj ne estas disponataj\n"
@@ -1508,18 +1528,18 @@ msgstr "Nevalida komando (provu per \"helpo\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ne funkcias por �i tiu komando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "ne povas malfermi '%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1805,24 +1825,16 @@ msgstr "Nevalida 
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uzas flankan �losilon %08lX anstata� la �efa �losilo %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Komandoj:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1951,17 +1963,6 @@ msgstr "|metodo [dosieroj]|presi mesa
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opcioj:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "krei eligon en askia kiraso"
@@ -2387,7 +2388,7 @@ msgstr "
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
@@ -3108,12 +3109,12 @@ msgstr "eraro dum kreado de 
 msgid "keyring `%s' created\n"
 msgstr "�losilaro '%s' kreita\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "eraro dum kreado de '%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "malsukcesis rekonstrui �losilaran staplon: %s\n"
@@ -3445,20 +3446,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "�i tiu �losilo ne estas protektita.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "�losilo estas protektita.\n"
 
@@ -3475,7 +3476,7 @@ msgstr ""
 "Donu la novan pasfrazon por �i tiu sekreta �losilo.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "la pasfrazo ne estis �uste ripetita; provu denove"
 
@@ -4278,12 +4279,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "�losilgrando rondigita �is %u bitoj\n"
@@ -4423,7 +4424,7 @@ msgstr "Petita 
 msgid "rounded up to %u bits\n"
 msgstr "rondigita �is %u bitoj\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4439,7 +4440,7 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4455,40 +4456,40 @@ msgstr ""
 "      <n>m = �losilo eksvalidi�os post n monatoj\n"
 "      <n>y = �losilo eksvalidi�os post n jaroj\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "�losilo validu ...? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�losilo validu por ...? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "nevalida valoro\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s neniam eksvalidi�os\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s eksvalidi�os je %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4496,12 +4497,12 @@ msgstr ""
 "Via sistemo ne povas montri datojn post 2038.\n"
 "Tamen, �i estos �uste traktata �is 2106.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�u tio estas �usta (j/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4512,7 +4513,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4528,44 +4529,44 @@ msgstr ""
 "    \"Heinrich Heine (la poeto) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Vera nomo: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Nevalida signo en nomo\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Nomo ne povas komenci�i per cifero\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nomo devas havi almena� 5 signojn\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Retadreso: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Nevalida retadreso\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Komento: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Nevalida signo en komento\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vi uzas la signaron '%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4576,7 +4577,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4591,23 +4592,23 @@ msgstr "Bonvolu ne meti la retadreson en la veran nomon a
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnKkAaBbFf"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Bonvolu korekti la eraron unue\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4615,12 +4616,12 @@ msgstr ""
 "Vi bezonas pasfrazon por protekti vian sekretan �losilon.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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 +4633,7 @@ msgstr ""
 "uzante �i tiun programon kun la opcio \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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 +4645,50 @@ msgstr ""
 "kreado de la primoj; tio donas al la stokastilo pli bonan �ancon\n"
 "akiri sufi�e da entropio.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Kreado de �losiloj nuligita.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skribas publikan �losilon al '%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "neniu skribebla publika �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "neniu skribebla sekreta �losilaro trovita: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eraro dum skribado de publika �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "publika kaj sekreta �losiloj kreitaj kaj subskribitaj.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4696,12 +4697,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4709,7 +4710,7 @@ msgstr ""
 "�losilo estis kreita %lu sekundon en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4717,26 +4718,26 @@ msgstr ""
 "�losilo estis kreita %lu sekundojn en la estonteco (tempotordo a� "
 "horlo�eraro)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�u vere krei? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "ne povas krei '%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTO: sekreta �losilo %08lX eksvalidi�is je %s\n"
@@ -4802,45 +4803,45 @@ msgstr "     
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTO: ekzistas 2 dosieroj kun sekretaj informoj.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s estas la ne�an�ita\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s estas la nova\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Bonvolu ripari �i tiun eblan sekurecproblemon\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolas �losilaron '%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu �losiloj kontrolitaj (%lu subskriboj)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: �losilaro kreita\n"
@@ -4888,7 +4889,7 @@ msgstr "el"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "nevalida �losilaro"
@@ -4903,126 +4904,126 @@ msgstr "
 msgid "key not found on keyserver\n"
 msgstr "�losilo '%s' ne trovita: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "subskribita per via �losilo %08lX je %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "ser�as pri \"%s\" �e HKP-servilo %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "nevalida �losilaro"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "neniu �losilservilo konata (uzu la opcion --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "�losilservila eraro"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: ne valida �losilidentigilo\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "petas la �losilon %08lX de HKP-�losilservilo %s ...\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "Averto: malsekura posedeco sur %s \"%s\"\n"
@@ -5392,7 +5393,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (�ef�losilo %08lX)"
@@ -5423,7 +5424,12 @@ msgstr "nuligita de uzanto\n"
 msgid "problem with the agent: %s\n"
 msgstr "problemo kun agento: agento redonas 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ne traktita"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5433,12 +5439,12 @@ msgstr ""
 "Vi bezonas pasfrazon por mal�losi la sekretan �losilon\n"
 "por la uzanto: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bita %s-�losilo, %08lX, kreita je %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6598,11 +6604,6 @@ 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"
@@ -6633,40 +6634,40 @@ msgstr "ne povas malfermi %s: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "publika �losilo %08lX ne trovita: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
@@ -6695,58 +6696,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Kialo por revoko: "
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
@@ -6766,15 +6777,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6804,7 +6815,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
@@ -6813,11 +6824,11 @@ msgstr "Kreado de 
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6839,114 +6850,104 @@ msgstr "
 msgid "|A|Please enter the Admin PIN"
 msgstr "�an�i la pasfrazon"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Kialo por revoko: "
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "eraro dum legado de �losilbloko: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: eraro dum legado de libera registro: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "'%s' jam densigita\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "krei novan �losilparon"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "forvi�o de �losilbloko malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
@@ -7795,21 +7796,21 @@ msgstr "ne povis analizi URI de 
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "ne povas fermi '%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7832,7 +7833,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -7934,17 +7935,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "protekto-metodo %d%s ne estas realigita\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrolo de kreita subskribo malsukcesis: %s\n"
diff --git a/po/es.po b/po/es.po
index 72af57990..0b7a5d567 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -20,19 +20,19 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "plural: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 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:596
+#: agent/call-pinentry.c:597
 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:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -42,7 +42,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr "Calidad:"
 
@@ -52,32 +52,32 @@ msgstr "Calidad:"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr "barra de calidad, entrada de pin"
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (intento %d de %d)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "PIN demasiado largo"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "Frase contrase�a demasiado larga"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "Caracteres inv�lidos en el PIN"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "PIN demasiado corto"
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 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:746
+#: agent/call-pinentry.c:747
 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:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "Frase contrase�a"
 
@@ -112,22 +112,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "no se puede abrir `%s': %s\n"
@@ -170,7 +170,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "Por favor vuelva a introducir frase contrase�a"
 
@@ -184,7 +183,7 @@ msgstr ""
 "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/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "no coincide - reint�ntelo"
 
@@ -243,13 +242,13 @@ msgstr "PIN repetido incorrectamente; int
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Por favor introduzca el PIN%s%s%s para desbloquear la tarjeta"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "error creando fichero temporal: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "error escribiendo en el fichero temporal: %s\n"
@@ -331,8 +330,8 @@ 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 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -432,7 +431,7 @@ msgstr "permitir emulaci
 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:146
+#: 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
 msgid "Please report bugs to <"
@@ -455,140 +454,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "nombre de socket demasiado largo\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "el nombre de socket `%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fall�: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escuchando el socket `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() fall� para `%s': %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "no puede usar `%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, 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:1774
+#: agent/gpg-agent.c:1777
 #, 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:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -606,11 +605,36 @@ msgstr ""
 "Sintaxis: gpg-preset-passphrase [opciones] KEYGRIP\n"
 "Mantenimiento de la cach� de contrase�as\n"
 
-#: agent/protect-tool.c:149
+# �rdenes, please...
+# 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
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opciones:\n"
+" "
+
+#: agent/protect-tool.c:162
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg-protect-tool [opciones] (-h para ayuda)\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -618,22 +642,22 @@ msgstr ""
 "Sintaxis: gpg-protect-tool [opciones] [args]\n"
 "Herramienta para el mantenimiento de claves secretas\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 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:1199
+#: agent/protect-tool.c:1155
 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:1202
+#: agent/protect-tool.c:1161
 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:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -650,19 +674,19 @@ msgstr ""
 # �Por qu� los ingleses entonces s� que saben lo que es un "passphrase"?
 # �Es que son m�s listos? :-)
 #
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Frase contrase�a:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "cancelado\n"
+
+#: agent/protect-tool.c:1178 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/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "cancelado\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -698,7 +722,7 @@ msgstr "opci
 msgid "error reading `%s', line %d: %s\n"
 msgstr "error leyendo `%s', l�nea %d: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "error leyendo la lista de certificados ra�z fiables\n"
 
@@ -708,9 +732,9 @@ msgstr "error leyendo la lista de certificados ra
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -719,11 +743,11 @@ msgstr ""
 "�Conf�a absolutamente en%%0A  \"%s\"%%0A para certificar correctamentelos "
 "certificados de otros usuarios?"
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "S�"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "No"
 
@@ -735,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -747,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "Correcto"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -778,43 +802,43 @@ msgstr "Cambia la frase contrase
 msgid "I'll change it later"
 msgstr "La cambiar� m�s tarde"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "error creando tuber�a: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse tuber�a para leer: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "fallo esperando que el proceso %d terminara: %s\n"
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "error obteniendo c�digo de finalizaci�n del proceso: %d %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "error ejecutando `%s': probablemente no est� instalado\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error ejecutando `%s': terminado\n"
@@ -1186,7 +1210,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1194,7 +1218,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr "No hay C�digo de Reinicio o ya no est� disponible\n"
 
@@ -1482,18 +1506,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "no se puede abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "clave \"%s\" no encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1778,28 +1802,16 @@ msgstr "Clave %s inv
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando subclave %s en vez de clave primaria %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "clave %s: clave secreta sin clave p�blica - omitida\n"
 
-# �rdenes, please...
-# S�, este no he podido ser yo :-) Por cierto, �por qu� la O no se
-# puede acentuar? �demasiado alta?
-# �Qui�n dice que no se puede? :-)
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@�rdenes:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 msgid "make a signature"
 msgstr "crea una firma"
@@ -1924,17 +1936,6 @@ msgstr "imprime res
 msgid "run in server mode"
 msgstr "ejecutar en modo servidor"
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opciones:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea una salida ascii con armadura"
@@ -2351,7 +2352,7 @@ msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
@@ -3071,12 +3072,12 @@ msgstr "error escribiendo anillo `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "anillo `%s' creado\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "recurso de bloque de claves: `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo reconstruyendo cach� del anillo de claves: %s\n"
@@ -3369,19 +3370,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Esta clave no est� protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "La clave est� protegida.\n"
 
@@ -3398,7 +3399,7 @@ msgstr ""
 "Introduzca la nueva frase contrase�a para esta clave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "frase contrase�a repetida incorrectamente; int�ntelo de nuevo"
 
@@ -4148,12 +4149,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de clave redondeado a %u bits\n"
@@ -4293,7 +4294,7 @@ msgstr "El tama
 msgid "rounded up to %u bits\n"
 msgstr "redondeados a %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4309,7 +4310,7 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4325,38 +4326,38 @@ msgstr ""
 "      <n>m = la clave caduca en n meses\n"
 "      <n>y = la clave caduca en n a�os\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "�Validez de la clave (0)? "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Clave v�lida �durante? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "La clave nunca caduca\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "La firma nunca caduca\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La clave caduca %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La firma caduca el %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4364,11 +4365,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "�Es correcto? (s/n) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4382,7 +4383,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4398,44 +4399,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nombre y apellidos: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido en el nombre\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "El nombre no puede empezar con un n�mero\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "El nombre debe tener al menos 5 caracteres\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Direcci�n de correo electr�nico: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Direcci�n inv�lida\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido en el comentario\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� usando el juego de caracteres `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4446,7 +4447,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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 "
@@ -4463,23 +4464,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcDdVvSs"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primero el error.\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4487,12 +4488,12 @@ msgstr ""
 "Necesita una frase contrase�a para proteger su clave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4504,7 +4505,7 @@ msgstr ""
 "la opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4517,50 +4518,50 @@ msgstr ""
 "generador de n�meros aleatorios mayor oportunidad de recoger suficiente\n"
 "entrop�a.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Creaci�n de claves cancelada.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escribiendo clave p�blica en `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escribiendo apuntador de la clave privada en `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escribiendo clave privada en `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "anillo p�blico de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "anillo privado de claves no escribible encontrado: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "error escribiendo anillo p�blico `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "error escribiendo anillo privado `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "claves p�blica y secreta creadas y firmadas.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4568,12 +4569,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Creaci�n de la clave fallida: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4581,7 +4582,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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4589,25 +4590,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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "�Crear de verdad? (s/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "almacenado de clave en la tarjeta fallido: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, 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:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: copia de seguridad de la clave guardada en `%s'\n"
@@ -4666,45 +4667,45 @@ msgstr "      Huella de clave ="
 msgid "      Card serial no. ="
 msgstr "      N�mero de serie de la tarjeta ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renombrando `%s' en `%s' fallo: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATENCI�N: existen 2 ficheros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s es el que no se ha modificado\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s es el nuevo\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor arregle este posible fallo de seguridad\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memorizando anillo `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu claves memorizadas hasta ahora (%lu firmas)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu claves memorizadas (%lu firmas)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anillo creado\n"
@@ -4754,7 +4755,7 @@ msgstr "deshabilitado"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduzca n�mero(s), O)tro, o F)in >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocolo del servidor de claves inv�lido (us %d!=handler %d)\n"
@@ -4768,125 +4769,125 @@ msgstr "clave \"%s\" no encontrada en el servidor\n"
 msgid "key not found on keyserver\n"
 msgstr "clave no encontrada en el servidor\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando clave %s de %s servidor %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando clave %s de %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando nombres desde %s servidor %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando nombres de %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "enviando clave %s a %s servidor %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "enviando clave %s a %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" de %s servidor %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" de %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "�no se solicita ninguna acci�n al servidor de claves!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVISO: el manejo de claves procede de una versi�n diferente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "el servidor de claves no envi� VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "no hay servidores de claves conocidos (use opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "no se pueden realizar llamadas a un servidor externo de claves tal y\n"
 "como est� compilado el programa\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "no hay un manejador para ese esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "la acci�n `%s' no es posible con este esquema de servidor de claves `%s'\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s no permite usar la versi�n %d del manejador\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "agotado el tiempo de espera para el servidor de claves\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "error interno del servidor de claves\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "error de comunicaci�n con el servidor de claves: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" no es un identificador de clave v�lido: omitido\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: no se puede renovar la clave %s a traves de %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "renovando 1 clave de %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "renovando %d claves desde %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: imposible recuperar URI %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: imposible interpretar URI %s\n"
@@ -5247,7 +5248,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr "(ID de clave primaria %s)"
@@ -5280,7 +5281,11 @@ msgstr "cancelado por el usuario\n"
 msgid "problem with the agent: %s\n"
 msgstr "problema con el agente: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "memoria desbordada\n"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5289,12 +5294,12 @@ msgstr ""
 "Necesita una frase contrase�a para desbloquear la clave secreta\n"
 "del usuario: \"%s\"\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subclave en clave principal ID %s)"
@@ -6447,10 +6452,6 @@ 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"
@@ -6481,40 +6482,40 @@ msgstr "iconv_open fall
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "la conversi�n de `%s' en `%s' fall�: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "no se puede crear el fichero temporal `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "error escribiendo en `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "borrando fichero de bloqueo residual (creado por %d)\n"
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr " - probablemente muerto - suprimiendo el bloqueo"
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "esperando al bloqueo (que mantiene %d%s) %s...\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr "(�bloqueo mutuo?)"
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "bloqueo `%s' no hecho: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "esperando al bloqueo %s...\n"
@@ -6543,58 +6544,68 @@ msgstr ""
 "Sintaxis: kbxutil [opciones] [ficheros]\n"
 "listar, exportar, importar datos Keybox\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "la funci�n de manejo del PIN devolvi� un error: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "el PIN-Nulo no ha sido cambiado\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Por favor inntroduzca su PIN en el teclado del lector"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Introduzca PIN de Administrador en el teclado del lector"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Por favor introduzca C�digo de Reinicio de la tarjeta"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Por favor introduzca C�digo de Reinicio de la tarjeta"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "error obteniendo nuevo PIN: %s\n"
@@ -6614,15 +6625,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la respuesta no incluye el exponente p�blico RSA\n"
 
@@ -6651,7 +6662,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la verificaci�n CHV%d fall�: %s\n"
@@ -6660,11 +6671,11 @@ msgstr "la verificaci
 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:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "�la tarjeta est� bloqueada permanentemente!\n"
 
@@ -6690,109 +6701,99 @@ msgstr ""
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Por favor introduzca PIN"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Por favor introduzca C�digo de Reinicio de la tarjeta"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr "|CR|Nuevo C�digo de Reinicio"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nuevo PIN Administrador"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Nuevo PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "error leyendo datos de la aplicaci�n\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "error leyendo huella digital DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "la clave ya existe\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "la clave existente ser� reemplazada\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "generando nueva clave\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "falta fecha de creaci�n\n"
 
-#: scd/app-openpgp.c:2371
-#, 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-openpgp.c:2383
-#, 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-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "fallo al almacenar la clave: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "por favor, espere mientras se genera la clave ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "la generaci�n de la clave fall�\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generaci�n de clave completada (%d segundos)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "estructura de la tarjeta OpenPGP inv�lida (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 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:2794
+#: scd/app-openpgp.c:2824
 #, 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:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "firmas creadas hasta ahora: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "no se puede acceder a %s - �tarjeta OpenPGP inv�lida?\n"
@@ -7589,21 +7590,21 @@ msgstr "no se puede interpretar el servidor de claves\n"
 msgid "WARNING: running with faked system time: "
 msgstr "AVISO: ejecut�ndose con hora del sistema falsificada"
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importando certificados comunes `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "no puedo firmar usando `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: 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:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr "orden inv�lida (no hay orden impl�cita)\n"
 
@@ -7625,7 +7626,7 @@ msgstr "fallaron comprobaciones b
 msgid "error importing certificate: %s\n"
 msgstr "error importando el certificado: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "error leyendo entrada: %s\n"
@@ -7735,17 +7736,17 @@ msgstr ""
 "\"%s\"\n"
 "�Observe que este certificado NO crear� una firma cualificada!"
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "resumen %d (%s) para firmante %d no puede utilizarse; usando %s\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "algoritmo de hash usado para el firmante %d: %s (%s)\n"
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "la comprobaci�n de la firma cualificada fall�: %s\n"
diff --git a/po/et.po b/po/et.po
index 3e66a8a6a..7dbf008e8 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-15\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -34,7 +34,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,45 +44,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "rida on liiga pikk\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "liiga pikk parool\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "halb MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "halb parool"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "halb parool"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuda parooli"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -224,13 +223,13 @@ msgstr "parooli ei korratud 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjutan faili `%s'\n"
@@ -303,8 +302,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -411,7 +410,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -434,142 +433,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,55 +585,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"V�tmed:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "halb parool"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "viga parooli loomisel: %s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Katkesta"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -670,7 +690,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -680,21 +700,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "jah"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -706,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -716,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -745,43 +765,43 @@ msgstr "muuda parooli"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -1177,7 +1197,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1187,7 +1207,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "salajase v�tme komponendid ei ole k�ttesaadavad\n"
@@ -1499,18 +1519,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' ei �nnestu avada\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1808,24 +1828,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "kasutan sekundaarset v�tit %08lX primaarse v�tme %08lX asemel\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti avaliku v�tmeta - j�tsin vahele\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@K�sud:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1954,17 +1966,6 @@ msgstr "|algo [failid]|tr
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"V�tmed:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "loo ascii pakendis v�ljund"
@@ -2388,7 +2389,7 @@ msgstr "teate kr
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
@@ -3109,12 +3110,12 @@ msgstr "viga v
 msgid "keyring `%s' created\n"
 msgstr "v�tmehoidla `%s' on loodud\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "viga `%s' loomisel: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "v�tmehoidla vahem�lu uuesti loomine eba�nnestus: %s\n"
@@ -3429,20 +3430,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "See v�ti ei ole kaitstud.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "V�ti on kaitstud.\n"
 
@@ -3459,7 +3460,7 @@ msgstr ""
 "Sisestage sellele salajasele v�tmele uus parool.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "parooli ei korratud �ieti; proovige uuesti"
 
@@ -4258,12 +4259,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "v�tme suurus �mardatud �les %u bitini\n"
@@ -4403,7 +4404,7 @@ msgstr "Soovitud v
 msgid "rounded up to %u bits\n"
 msgstr "�mardatud �les %u bitini\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4419,7 +4420,7 @@ msgstr ""
 "      <n>m = v�ti aegub n kuuga\n"
 "      <n>y = v�ti aegub n aastaga\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4435,40 +4436,40 @@ msgstr ""
 "      <n>m = allkiri aegub n kuuga\n"
 "      <n>y = allkiri aegub n aastaga\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "V�ti on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allkiri on kehtiv kuni? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "vigane v��rtus\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei aegu kunagi\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s aegub %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allkiri aegub %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4476,12 +4477,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "On see �ige (j/e)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4492,7 +4493,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4508,44 +4509,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "P�risnimi: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Lubamatu s�mbol nimes\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei v�i alata numbriga\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nimes peab olema v�hemalt 5 s�mbolit\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "E-posti aadress: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Selline e-posti aadress ei ole lubatud\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Kommentaar: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Lubamatu s�mbol kommentaaris\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Te kasutate kooditabelit `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4556,7 +4557,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4571,23 +4572,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoVv"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Palun parandage k�igepealt viga\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4595,12 +4596,12 @@ msgstr ""
 "Te vajate oma salajase v�tme kaitsmiseks parooli.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4612,7 +4613,7 @@ msgstr ""
 "kasutades seda programmi v�tmega \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4624,50 +4625,50 @@ msgstr ""
 "kasutada kettaid jne), see annaks juhuarvude generaatorile v�imaluse\n"
 "koguda paremat entroopiat.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "V�tme genereerimine katkestati.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjutan avaliku v�tme faili `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjutatavat avalike v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjutatavat salajaste v�tmete hoidlat pole: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "viga avaliku v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "avalik ja salajane v�ti on loodud ja allkirjastatud.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4677,43 +4678,43 @@ msgstr ""
 "Kr�ptimiseks tuleb genereerida teine v�ti, seda saate teha\n"
 "kasutades v�tit \"--edit-key\".\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Loon t�esti? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "`%s' ei �nnestu luua: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "M�RKUS: salajane v�ti %08lX aegus %s\n"
@@ -4773,45 +4774,45 @@ msgstr "     V
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "HOIATUS: on olemas 2 faili konfidentsiaalse infoga.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s ei ole muudetud\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uus\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Palun parandage see v�imalik turvaprobleem\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrollin v�tmehoidlat `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "kontrollitud %lu v�tit (%lu allkirja)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: v�tmehoidla on loodud\n"
@@ -4859,7 +4860,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "vigased ekspordi v�tmed\n"
@@ -4874,126 +4875,126 @@ msgstr "v
 msgid "key not found on keyserver\n"
 msgstr "v�tit '%s' ei leitud: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allkirjastatud teie v�tmega %08lX %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "otsin \"%s\" HKP serverist %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "v�tmeserveri viga"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "k�sin v�tit %08lX v�tmeserverist %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "HOIATUS: ei saa kustutada ajutist faili (%s) `%s': %s\n"
@@ -5361,7 +5362,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (peamise v�tme ID %08lX)"
@@ -5392,7 +5393,12 @@ msgstr "katkestatud kasutaja poolt\n"
 msgid "problem with the agent: %s\n"
 msgstr "probleem agendiga: agent tagastas 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei t��deldud"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5402,12 +5408,12 @@ msgstr ""
 "Te vajate kasutaja salajase v�tme lahtilukustamiseks\n"
 "parooli: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6567,11 +6573,6 @@ 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"
@@ -6602,40 +6603,40 @@ msgstr "faili ei 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "ei leia avalikku v�tit %08lX: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
@@ -6664,58 +6665,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuda parooli"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "viga parooli loomisel: %s\n"
@@ -6735,15 +6746,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6773,7 +6784,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
@@ -6782,11 +6793,11 @@ msgstr "v
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6808,114 +6819,104 @@ msgstr "muuda parooli"
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuda parooli"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Palun valige t�histamise p�hjus:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "viga v�tmebloki lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: viga vaba kirje lugemisel: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' on juba pakitud\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genereeri uus v�tmepaar"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "v�tmebloki kustutamine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "V�tme genereerimine eba�nnestus: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, 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:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "ei leia OpenPGP andmeid.\n"
@@ -7749,21 +7750,21 @@ msgstr "ei saa parsida v
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' ei �nnestu sulgeda: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7786,7 +7787,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -7888,17 +7889,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "kaitse algoritm %d%s ei ole toetatud\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Loodud allkirja ei �nnestu kontrollida: %s\n"
diff --git a/po/fi.po b/po/fi.po
index d29df9f1a..f5786100d 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -30,18 +30,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -50,7 +50,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -60,45 +60,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "rivi on liian pitkä\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "salasana on liian pitkä\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI ei kelpaa"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "väärä salasana"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "väärä salasana"
@@ -108,22 +108,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
@@ -164,7 +164,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muuta salasanaa"
@@ -177,7 +176,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -240,13 +239,13 @@ msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
@@ -319,8 +318,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -427,7 +426,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -451,142 +450,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -603,55 +602,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Valitsimet:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "väärä salasana"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "virhe luotaessa salasanaa: %s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Peru"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -687,7 +707,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -697,21 +717,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "kyllä|kylla|joo"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -723,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -733,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -762,43 +782,43 @@ msgstr "muuta salasanaa"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -1196,7 +1216,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1206,7 +1226,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "salaisen avaimen osat eivät ole käytettävissä\n"
@@ -1518,18 +1538,18 @@ msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ei toimi yhdessä tämän komennon kanssa\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tiedostoa \"%s\" ei voi avata\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1824,27 +1844,19 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "käytetään toissijaista avainta %08lX ensisijaisen avaimen %08lX sijasta\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr ""
 "avain %08lX: salaisella avaimella ei ole vastaavaa \n"
 "julkista avainta - ohitetaan\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Komennot:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1973,17 +1985,6 @@ msgstr "|algo [tiedostot]|tulosta viestien tiivisteet"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Valitsimet:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "tuota ascii-koodattu tuloste"
@@ -2408,7 +2409,7 @@ msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
@@ -3133,12 +3134,12 @@ msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 msgid "keyring `%s' created\n"
 msgstr "avainrengas \"%s\" luotu\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "virhe luotaessa \"%s\": %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "avainrenkaan välimuistin uudelleenluominen epäonnistui: %s\n"
@@ -3456,20 +3457,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Avainta ei ole suojattu.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Avain on suojattu.\n"
 
@@ -3486,7 +3487,7 @@ msgstr ""
 "Syötä uusi salasana salaiselle avaimelle.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "salasanaa ei toistettu oikein, yritä uudestaan."
 
@@ -4290,12 +4291,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "avaimen koko on pyöristetty %u bittiin\n"
@@ -4435,7 +4436,7 @@ msgstr "Halutun avaimen koko on %u bittiä\n"
 msgid "rounded up to %u bits\n"
 msgstr "pyöristetty %u bittiin\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4451,7 +4452,7 @@ msgstr ""
 "     <n>m = Avain vanhenee n kuukauden kuluttua\n"
 "     <n>y = Avain vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4467,40 +4468,40 @@ msgstr ""
 "     <n>m = Allekirjoitus vanhenee n kuukauden kuluttua\n"
 "     <n>y = Allekirjoitus vanhenee n vuoden kuluttua\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Avain on voimassa? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Allekirjoitus on voimassa? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "arvo ei kelpaa\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s ei vanhene koskaan\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s vanhenee %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Allekirjoitus vanhenee %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4508,12 +4509,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Onko tämä oikein (k/e) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4524,7 +4525,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4542,44 +4543,44 @@ msgstr ""
 "     \"Matti Meikäläinen (nuorempi) <matti.meikalainen@osoite.fi>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Oikea nimi: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Nimessä on epäkelpo merkki\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Nimi ei voi alkaa numerolla\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 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:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Sähköpostiosoite: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Sähköpostiosoite ei kelpaa\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Huomautus: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Huomautuksessa on epäkelpo merkki\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Käytät merkistöä \"%s\".\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4590,7 +4591,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4605,23 +4606,23 @@ msgstr "Älä syötä sähköpostiosoitetta nimen tai huomautuksen paikalle\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnHhSsOoLl"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Ole hyvä ja korjaa ensin virhe\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4629,12 +4630,12 @@ msgstr ""
 "Tarvitset salasanan suojaamaan salaista avaintasi.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 msgid ""
 "You don't want a passphrase - this is probably a *bad* idea!\n"
 "I will do it anyway.  You can change your passphrase at any time,\n"
@@ -4646,7 +4647,7 @@ msgstr ""
 "tämän ohjelman valitsimella \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4658,50 +4659,50 @@ msgstr ""
 "alkulukujen luomisen aikana, tämä antaa satunnaislukugeneraattorille\n"
 "paremmat mahdollisuudet kerätä riittävästi entropiaa.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Avaimen luonti keskeytetty.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "kirjoitan julkisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa julkista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa salaista avainrengasta ei löydy: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa julkiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "julkinen ja salainen avain on luotu ja allekirjoitettu.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4710,12 +4711,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4723,7 +4724,7 @@ msgstr ""
 "avain on luotu %lu sekunti tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4731,26 +4732,26 @@ msgstr ""
 "avain on luotu %lu sekuntia tulevaisuudessa (on tapahtunut aikahyppy tai\n"
 "kellon kanssa on ongelmia)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Haluatko varmasti luoda? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "HUOM: salainen avain %08lX vanheni %s\n"
@@ -4810,45 +4811,45 @@ msgstr "     Avaimen sormenjälki ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROITUS: löytyi 2 tiedostoa, joissa on luottamuksellisia tietoja.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s säilyi muuttumattomana\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s on uusi\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Ole hyvä ja korjaa tämä mahdollinen tietoturvareikä\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "tarkistetaan avainrengasta \"%s\"\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "käsiteltiin %lu avainta (%lu allekirjoitusta)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: avainrengas luotu\n"
@@ -4898,7 +4899,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "virheelliset vientivalitsimet\n"
@@ -4913,126 +4914,126 @@ msgstr "avainta \"%s\" ei löydy: %s\n"
 msgid "key not found on keyserver\n"
 msgstr "avainta \"%s\" ei löydy: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "allekirjoitettu avaimellasi %08lX %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "etsitään \"%s\" HKP-palvelimelta %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "avainpalvelinvirhe"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "pyydetään avainta %08lX kohteesta %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROITUS: tilapäistiedostoa (%s) \"%s\" ei voi poistaa: %s\n"
@@ -5407,7 +5408,7 @@ msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (pääavaimen tunnus %08lX)"
@@ -5438,7 +5439,12 @@ msgstr "käyttäjän peruma\n"
 msgid "problem with the agent: %s\n"
 msgstr "agentin käytössä on ongelmia: agentti vastaa 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ei käsitelty"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5447,12 +5453,12 @@ msgstr ""
 "\n"
 "Tarvitset salasanan avataksesi salaisen avaimen käyttäjälle: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bittinen %s-avain, tunnus %08lX, luotu %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6631,11 +6637,6 @@ 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"
@@ -6666,40 +6667,40 @@ msgstr "ei voi avata tiedostoa: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "julkista avainta %08lX ei löydy: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
@@ -6729,58 +6730,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muuta salasanaa"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
@@ -6800,15 +6811,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6838,7 +6849,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
@@ -6847,11 +6858,11 @@ msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6873,115 +6884,105 @@ msgstr "muuta salasanaa"
 msgid "|A|Please enter the Admin PIN"
 msgstr "muuta salasanaa"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Valitse mitätöinnin syy:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "virhe luettaessa avainlohkoa: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: virhe luettaessa vapaata tietuetta: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" on jo pakattu\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "luo uusi avainpari"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "avainlohkojen poisto epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Avaimen luonti epäonnistui: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 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:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
@@ -7815,21 +7816,21 @@ msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi sulkea: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7852,7 +7853,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -7954,17 +7955,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "suojausalgoritmi %d%s ei ole käytettävissä\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "luodun allekirjoituksen tarkistus epäonnistui: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 318c4809f..57deadbfe 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -19,18 +19,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "impossible de stocker l'empreinte: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -39,7 +39,7 @@ msgstr "Entrez le mot de passe ; c'est une phrase secr
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "validit�: %s"
@@ -50,45 +50,45 @@ msgstr "validit
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "ligne trop longue"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "mauvais entier en pr�cision multiple (MPI)"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "mauvaise phrase de passe"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "mauvaise phrase de passe"
@@ -98,22 +98,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossible d'ouvrir `%s': %s\n"
@@ -157,7 +157,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "changer la phrase de passe"
@@ -170,7 +169,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -233,13 +232,13 @@ msgstr "le code PIN n'a pas 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr ""
@@ -315,8 +314,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -425,7 +424,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -450,144 +449,144 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, 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:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -604,55 +603,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Options:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "mauvaise phrase de passe"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "annul�"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -688,7 +708,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -698,21 +718,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "oui"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -724,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -734,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -763,45 +783,45 @@ msgstr "changer la phrase de passe"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -1198,7 +1218,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1207,7 +1227,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "les parties secr�tes ne sont pas disponibles\n"
@@ -1500,18 +1520,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossible d'ouvrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cl� � %s � introuvable: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1814,26 +1834,18 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr ""
 "utilisation de la sous-cl� %s � la place de la cl�\n"
 "principale %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cl� %s: cl� secr�te sans cl� publique - non prise en compte\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Commandes:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1961,17 +1973,6 @@ msgstr "|alg. [fich.]|indiquer les fonctions de hachage"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Options:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "cr�er une sortie ascii avec armure"
@@ -2423,7 +2424,7 @@ msgstr ""
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
@@ -3158,12 +3159,12 @@ msgstr "erreur durant la cr
 msgid "keyring `%s' created\n"
 msgstr "le porte-cl�s `%s` a �t� cr��\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "ressource bloc de cl�s `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "la reconstruction du cache de porte-cl�s a �chou� : %s\n"
@@ -3464,21 +3465,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Cette cl� n'est pas prot�g�e.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "La cl� est prot�g�e.\n"
 
@@ -3493,7 +3494,7 @@ msgid ""
 "\n"
 msgstr "Entrez la nouvelle phrase de passe pour cette cl� secr�te.\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "la phrase de passe n'a pas �t� correctement r�p�t�e ; recommencez."
 
@@ -4288,12 +4289,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "taille arrondie � %u bits\n"
@@ -4431,7 +4432,7 @@ msgstr "La taille demand
 msgid "rounded up to %u bits\n"
 msgstr "arrondie � %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4447,7 +4448,7 @@ msgstr ""
 "      <n>m = la cl� expire dans n mois\n"
 "      <n>y = la cl� expire dans n ann�es\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4463,38 +4464,38 @@ msgstr ""
 "      <n>m = la signature expire dans n mois\n"
 "      <n>y = la signature expire dans n ann�es\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "La cl� est valide pour ? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "La signature est valide pour ? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valeur invalide\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "La cl� n'expire pas du tout\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "La signature n'expire pas du tout\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "La cl� expire le %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "La signature expire le %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4502,11 +4503,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Est-ce correct ? (o/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4517,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4533,44 +4534,44 @@ msgstr ""
 "   � Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de> �\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nom r�el: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Caract�re invalide dans le nom\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Le nom ne doit pas commencer par un chiffre\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 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:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Adresse e-mail: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Ce n'est pas une adresse e-mail valide\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Commentaire: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Caract�re invalide dans le commentaire\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Vous utilisez le jeu de caract�res '%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4581,7 +4582,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
@@ -4597,23 +4598,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Corrigez l'erreur d'abord\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4622,12 +4623,12 @@ msgstr ""
 "secr�te.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4641,7 +4642,7 @@ msgstr ""
 "� --edit-key �.\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4653,52 +4654,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "La g�n�ration de cl� a �t� annul�e.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�criture de la cl� publique dans `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�criture d'une cl� secr�te partielle dans `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, 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:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, 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:3521
+#: g10/keygen.c:3525
 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:3532
+#: g10/keygen.c:3536
 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"
@@ -4707,13 +4708,13 @@ msgstr ""
 "utiliser la commande �--edit-key� pour g�n�rer une sous-cl� �\n"
 "cette fin.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, 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:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4721,7 +4722,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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4729,26 +4730,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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Cr�er vraiment ? (o/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, 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:4008
+#: g10/keygen.c:4012
 #, 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:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTE: sauvegarde de la cl� de la carte dans `%s'\n"
@@ -4807,46 +4808,46 @@ msgstr "    Empreinte de la cl
 msgid "      Card serial no. ="
 msgstr "N� de s�rie de la carte ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr ""
 "ATTENTION: 2 fichiers avec des informations confidentielles existent.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s est le fichier original\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s est le nouveau\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "R�parez ce probl�me de s�curit� possible\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mise en ant�m�moire du porte-cl�s `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire v�rifi�es pour l'instant (%lu signatures)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu cl�s en ant�m�moire (%lu signatures)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porte-cl�s cr��\n"
@@ -4895,7 +4896,7 @@ msgstr "d
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Entrez le(s) nombre(s), S)uivant, ou Q)uitter > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocole serveur de cl�s invalide (nous %d!=gestionnaire %d)\n"
@@ -4909,131 +4910,131 @@ msgstr "cl
 msgid "key not found on keyserver\n"
 msgstr "cl� non trouv�e dans le serveur de cl�s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "requ�te de la cl� %s du serveur %s %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "requ�te de la cl� %s de %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "envoi de la cl� %s au serveur %s %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "envoi de la cl� %s � %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "recherche de � %s � du serveur %s %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "recherche de � %s � de %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "pas d'action pour le serveur de cl�s !\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISSEMENT: le gestionnaire de serveurs de cl�s provient d'une\n"
 "version diff�rente de GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "le serveurs de cl�s n'a pas envoy� son num�ro de VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "pas de serveur de cl�s connu (utilisez l'option --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "les appels externes � un serveur de cl� ne sont pas support�s dans\n"
 "cette compilation\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "pas de gestionnaire pour le type de serveurs de cl�s `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "l'action `%s' n'est pas support�e avec le type de serveurs\n"
 "de cl�s `%s'\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s ne supporte pas le gestionnaire de version %d\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "le d�lai d'attente du serveur de cl�s a expir�\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "erreur interne du serveur de cl�s\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "erreur de communication avec le serveur de cl�s: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "� %s � n'est pas une ID de cl�: ignor�\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "rafra�chissement d'une cl� depuis %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "rafra�chissement de %d cl�s depuis %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "AVERTISSEMENT: impossible de rafra�chir la cl� %s\n"
 "via %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -5413,7 +5414,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cl� principale %s)"
@@ -5445,7 +5446,12 @@ msgstr "annul
 msgid "problem with the agent: %s\n"
 msgstr "probl�me avec l'agent - arr�t d'utilisation de l'agent\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "non forc�"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5454,12 +5460,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:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "        (sous-cl� de la cl� principale ID %s)"
@@ -6652,11 +6658,6 @@ 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"
@@ -6687,40 +6688,40 @@ msgstr "la signature a 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "renommer `%s' en `%s' a �chou�: %s \n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "impossible de cr�er le r�pertoire `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "cl� publique %s non trouv�e : %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
@@ -6751,58 +6752,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "l'appel du PIN a retourn� une erreur: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 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"
@@ -6822,15 +6833,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "la r�ponse ne contient pas l'exposant public RSA\n"
 
@@ -6862,7 +6873,7 @@ msgstr ""
 "est %d\n"
 
 #: scd/app-openpgp.c:1535 scd/app-openpgp.c:1575 scd/app-openpgp.c:1703
-#: scd/app-openpgp.c:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "la v�rification CHV%d a �chou�: %s\n"
@@ -6871,11 +6882,11 @@ msgstr "la v
 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:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "la carte est irr�m�diablement bloqu�e !\n"
 
@@ -6899,115 +6910,105 @@ msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Entrez le PIN%%0A[sigs faites: %lu]"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nouveau code PIN d'administration"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Nouveau code PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "erreur pendant la lecture de donn�es d'application\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "erreur pendant la lecture de l'empreinte DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "la cl� existe d�j�\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "la cl� existante sera remplac�e\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "g�n�rer une nouvelle cl�\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "l'horodatage de cr�ation est manquant\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "le module RSA est manquant ou bien sa taille n'est pas %d bits\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "l'exposant public RSA est manquant ou trop �lev� (plus de %d bits)\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "le stockage de la cl� a �chou�: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "attendez que la cl� se g�n�re...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "la g�n�ration de la cl� a �chou�\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, 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:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structure de carte OpenPGP invalide (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "signature %s, algorithme de hachage %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signatures cr��es jusqu'ici: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "impossible d'acc�der � %s - carte OpenPGP invalide ?\n"
@@ -7844,21 +7845,21 @@ msgstr "impossible d'interpr
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossible d'acc�der � `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7881,7 +7882,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -7987,17 +7988,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "l'algorithme de protection %d%s n'est pas support�\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Impossible de v�rifier la signature cr��e: %s\n"
diff --git a/po/gl.po b/po/gl.po
index 92bc27c54..f8d31e04d 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 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:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -34,7 +34,7 @@ msgstr "Por favor, introduza o contrasinal; esta 
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,45 +44,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "li�a longa de m�is\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "contrasinal demasiado longo\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter non v�lido no nome\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI err�neo"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "contrasinal err�neo"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "contrasinal err�neo"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia-lo contrasinal"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -225,13 +224,13 @@ msgstr "o contrasinal non se repetiu correctamente; t
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "escribindo a `%s'\n"
@@ -304,8 +303,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -414,7 +413,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -439,142 +438,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -591,55 +590,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opci�ns:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "contrasinal err�neo"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancelar"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -675,7 +695,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -685,21 +705,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|sim"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -711,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -721,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -750,43 +770,43 @@ msgstr "cambia-lo contrasinal"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
@@ -1187,7 +1207,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1197,7 +1217,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "hai partes da chave secreta non dispo�ibles\n"
@@ -1509,18 +1529,18 @@ msgstr "Comando incorrecto (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non traballa con este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "non se puido abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1820,24 +1840,16 @@ msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "non hai unha sub-chave secreta para a sub-chave p�blica %08lX - ign�rase\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "empr�gase a chave secundaria %08lX no canto da primaria %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sen chave p�blica - omitida\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Comandos:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1966,17 +1978,6 @@ msgstr "|algo [ficheiros]|visualizar resumos de mensaxes"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opci�ns:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crear sa�da con armadura en ascii"
@@ -2403,7 +2404,7 @@ msgstr "para cifrar unha mensaxe en modo --pgp2 prec
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
@@ -3137,12 +3138,12 @@ msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "chaveiro `%s' creado\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao crear `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "fallo ao reconstru�-la cach� de chaveiros: %s\n"
@@ -3455,20 +3456,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Esta chave non est� protexida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "A chave est� protexida.\n"
 
@@ -3485,7 +3486,7 @@ msgstr ""
 "Introduza o novo contrasinal para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "o contrasinal non se repetiu correctamente; t�nteo de novo"
 
@@ -4303,12 +4304,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tama�o de chave redondeado a %u bits\n"
@@ -4448,7 +4449,7 @@ msgstr "O tama
 msgid "rounded up to %u bits\n"
 msgstr "redondeado a %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4464,7 +4465,7 @@ msgstr ""
 "      <n>m = a chave caduca en n meses\n"
 "      <n>y = a chave caduca en n anos\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4480,40 +4481,40 @@ msgstr ""
 "      <n>m = a sinatura caduca en n meses\n"
 "      <n>y = a sinatura caduca en n anos\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "�Por canto tempo � v�lida a chave? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "�Por canto tempo � v�lida a sinatura? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valor non v�lido\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non caduca nunca\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s caduca o %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "A sinatura caduca o %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4521,12 +4522,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "�Isto � correcto? (s/n) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4537,7 +4538,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4554,44 +4555,44 @@ msgstr ""
 "     \"Heinrich Heime (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nome: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Caracter non v�lido no nome\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "O nome non pode comezar cun d�xito\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome debe ter alomenos 5 caracteres\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Enderezo de E-mail: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Non � un enderezo de e-mail v�lido\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Comentario: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Car�cter non v�lido no comentario\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Est� a usa-lo xogo de caracteres `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4602,7 +4603,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
@@ -4618,23 +4619,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeAaSs"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Por favor, corrixa antes o erro\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4642,12 +4643,12 @@ msgstr ""
 "Necesita un contrasinal para protexe-la s�a chave secreta.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4659,7 +4660,7 @@ msgstr ""
 "momento, empregando este programa coa opci�n \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4671,50 +4672,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Cancelouse a xeraci�n de chaves.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "gravando a chave p�blica en `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, 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:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro p�blico `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 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:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4724,12 +4725,12 @@ msgstr ""
 "queira emprega-lo comando \"--edit-key\" para xerar unha chave secundaria\n"
 "con esa finalidade.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4737,7 +4738,7 @@ msgstr ""
 "creouse a chave %lu segundo no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4745,26 +4746,26 @@ msgstr ""
 "creouse a chave %lu segundos no futuro (salto no tempo ou problemas co "
 "reloxo)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "�Crear realmente? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "non se pode crear `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: a chave secreta %08lX caducou o %s\n"
@@ -4824,45 +4825,45 @@ msgstr "     Pegada dactilar ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existen dous ficheiros con informaci�n confidencial.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o que non cambiou\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor, ama�e este posible fallo de seguridade\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "comprobando o chaveiro `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chaves comprobadas (%lu sinaturas)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro creado\n"
@@ -4910,7 +4911,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
@@ -4925,127 +4926,127 @@ msgstr "non se atopou a chave `%s': %s\n"
 msgid "key not found on keyserver\n"
 msgstr "non se atopou a chave `%s': %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "asinado coa s�a chave %08lX no %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "buscando \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 "non hai un servidor de chaves co�ecido (empregue a opci�n --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s: non � un ID de chave v�lido\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "solicitando a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: non se puido borra-lo ficheiro temporal (%s) `%s': %s\n"
@@ -5415,7 +5416,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
@@ -5446,7 +5447,12 @@ msgstr "cancelado polo usuario\n"
 msgid "problem with the agent: %s\n"
 msgstr "problema co axente: o axente voltou coa resposta 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "non procesado"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5456,12 +5462,12 @@ msgstr ""
 "Necesita un contrasinal para desbloquea-la chave secreta para\n"
 "o usuario \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bits, chave %s, ID %08lX, creada %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6639,11 +6645,6 @@ 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"
@@ -6674,40 +6675,40 @@ msgstr "non se puido abrir un ficheiro: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "non se atopou a chave p�blica %08lX: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "gravando a chave secreta en `%s'\n"
@@ -6738,58 +6739,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
@@ -6809,15 +6820,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6847,7 +6858,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
@@ -6856,11 +6867,11 @@ msgstr "o env
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6882,114 +6893,104 @@ msgstr "cambia-lo contrasinal"
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia-lo contrasinal"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Por favor, escolla o motivo da revocaci�n:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro ao le-lo bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler un rexistro libre: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' xa est� comprimido\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "xerar un novo par de chaves"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "fallou o borrado do bloque de chaves: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A xeraci�n da chave fallou: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
@@ -7837,21 +7838,21 @@ msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "non se pode pechar `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7874,7 +7875,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -7976,17 +7977,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "o algoritmo de protecci�n %d%s non est� soportado\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "fallou a comprobaci�n da sinatura creada: %s\n"
diff --git a/po/hu.po b/po/hu.po
index 462d991b1..38dddd027 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -34,7 +34,7 @@ msgstr "K
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,45 +44,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "A sor t�l hossz�!\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "A jelsz� t�l hossz�!\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "hib�s MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "rossz jelsz�"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "rossz jelsz�"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "jelsz�v�ltoztat�s"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -224,13 +223,13 @@ msgstr "Nem ism
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
@@ -303,8 +302,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -411,7 +410,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -434,142 +433,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, 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:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,55 +585,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opci�k:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "rossz jelsz�"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "M�gsem"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -670,7 +690,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -680,21 +700,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "igen"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -706,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -716,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -745,43 +765,43 @@ msgstr "jelsz
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -1177,7 +1197,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1187,7 +1207,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "Titkos kulcsr�szek nem �llnak rendelkez�sre.\n"
@@ -1499,18 +1519,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "Nem tudom megnyitni %s-t!\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1805,24 +1825,16 @@ msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "Nincs titkos alkulcs a %08lX nyilv�nos alkulcshoz - figyelmen k�v�l hagyom.\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "A %08lX m�sodlagos kulcsot haszn�ljuk a %08lX els�dleges helyett.\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "%08lX kulcs: titkos kulcs nyilv�nos kulcs n�lk�l - kihagytam.\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Parancsok:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1951,17 +1963,6 @@ msgstr "|algo [f
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opci�k:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ascii p�nc�lozott kimenet l�trehoz�sa"
@@ -2384,7 +2385,7 @@ msgstr "
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
@@ -3110,12 +3111,12 @@ msgstr "Hiba a(z) \"%s\" kulcskarika l
 msgid "keyring `%s' created\n"
 msgstr "\"%s\" kulcskarik�t l�trehoztam.\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "Hiba \"%s\" l�trehoz�sakor: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "Nem tudtam �jra�p�teni a kulcskarika cache-�t: %s\n"
@@ -3429,20 +3430,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Ez a kulcs nem v�dett.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "A kulcs v�dett.\n"
 
@@ -3459,7 +3460,7 @@ msgstr ""
 "�rja be az �j jelsz�t ehhez a titkos kulcshoz!\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "Nem ism�telte meg helyesen a jelsz�t! Pr�b�lja �jra!"
 
@@ -4262,12 +4263,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "Kulcsm�retet felkerek�tettem %u bitre.\n"
@@ -4407,7 +4408,7 @@ msgstr "A k
 msgid "rounded up to %u bits\n"
 msgstr "Felkerek�tve %u bitre.\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4423,7 +4424,7 @@ msgstr ""
 "      <n>m = a kulcs n h�napig �rv�nyes\n"
 "      <n>y = a kulcs n �vig �rv�nyes\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4439,40 +4440,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:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Meddig �rv�nyes a kulcs? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Meddig �rv�nyes az al��r�s? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "�rv�nytelen �rt�k!\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s soha nem j�r le.\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s lej�r: %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Az al��r�s lej�r: %s.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4480,12 +4481,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Ez �gy helyes (i/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4496,7 +4497,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4513,44 +4514,44 @@ msgstr ""
 "    \"Heinrich Heine (a k�lt�) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Teljes n�v: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "�rv�nytelen karakter a n�vben!\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "A n�v lehet, hogy nem kezd�dhet sz�mmal!\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "A n�v legal�bb 5 karakter kell legyen!\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "E-mail c�m: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Ez nem �rv�nyes e-mail c�m.\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Megjegyz�s: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "�rv�nytelen karakter a megjegyz�sben!\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, 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:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4561,7 +4562,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4576,24 +4577,24 @@ msgstr "K
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnMmEeRrKk"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "K�rem, el�bb jav�tsa ki a hib�t!\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4601,12 +4602,12 @@ msgstr ""
 "Most sz�ks�g van egy jelsz�ra (vagy mondatra), amely a titkos kulcs�t v�di.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4618,7 +4619,7 @@ msgstr ""
 "az \"--edit-key\" opci�val.\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4630,50 +4631,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Kulcs l�trehoz�sa megszak�tva.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "�rom a kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "Nem �rhat� nyilv�noskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "Nem �rhat� titkoskulcs-karik�t tal�ltam: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 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:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4683,46 +4684,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Val�ban l�trehozzam? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, 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:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "MEGJEGYZ�S: %08lX titkos kulcs %s-kor lej�rt.\n"
@@ -4782,45 +4783,45 @@ msgstr " Kulcs ujjlenyomata ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "FIGYELEM: 2 bizalmas inform�ci�kat tartalmaz� �llom�ny van!\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s az eredeti p�ld�ny.\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s az �j p�ld�ny.\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "K�rem, oldja meg ezt a lehets�ges biztons�gi probl�m�t!\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "Ellen�rz�m a(z) \"%s\" kulcskarik�t.\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kulcsot ellen�riztem (%lu al��r�ssal).\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: Kulcskarik�t l�trehoztam.\n"
@@ -4869,7 +4870,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "�rv�nytelen export opci�k!\n"
@@ -4884,128 +4885,128 @@ msgstr "\"%s\" kulcs nem tal
 msgid "key not found on keyserver\n"
 msgstr "\"%s\" kulcs nem tal�lhat�: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "Al��rva az �n %08lX kulcs�val %s id�pontban.\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "Keresem \"%s\"-t a %s HKP szerveren.\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kulcsszerverhiba"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "Lek�rem a %08lX kulcsot a %s kulcsszerverr�l.\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr ""
 "FIGYELEM: Nem tudom t�r�lni az (\"%s\") �tmeneti �llom�nyt: \"%s\": %s.\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr ""
@@ -5379,7 +5380,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr ""
@@ -5413,7 +5414,12 @@ msgstr "A felhaszn
 msgid "problem with the agent: %s\n"
 msgstr "Probl�ma az �gyn�kkel: �gyn�k v�lasza: 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nem feldolgozott"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5424,12 +5430,12 @@ msgstr ""
 "haszn�lat�hoz:\n"
 "\""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6599,11 +6605,6 @@ 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"
@@ -6634,40 +6635,40 @@ msgstr "Nem tudom megnyitni az 
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "Nem tudom a \"%s\" k�nyvt�rat l�trehozni: %s.\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "A(z) %08lX nyilv�nos kulcsot nem tal�lom: %s.\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
@@ -6696,58 +6697,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "K�rem, v�lassza ki a visszavon�s ok�t:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
@@ -6767,15 +6778,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6805,7 +6816,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
@@ -6814,11 +6825,11 @@ msgstr "K
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6840,114 +6851,104 @@ msgstr "jelsz
 msgid "|A|Please enter the Admin PIN"
 msgstr "jelsz�v�ltoztat�s"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, 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:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "Hiba a kulcsblokk olvas�sakor: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: Hiba szabad rekord olvas�sakor: %s.\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "\"%s\" m�r t�m�r�tett.\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "�j kulcsp�r l�trehoz�sa"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "A kulcsblokk t�rl�se sikertelen: %s.\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Kulcsgener�l�s sikertelen: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, 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:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
@@ -7782,21 +7783,21 @@ msgstr "
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, 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:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7819,7 +7820,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -7921,17 +7922,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "%d%s v�d� algoritmus nem t�mogatott.\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "A l�trehozott al��r�s ellen�rz�se sikertelen: %s.\n"
diff --git a/po/id.po b/po/id.po
index aca02557a..88bf71618 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -16,18 +16,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -36,7 +36,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -46,45 +46,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "baris terlalu panjang\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase terlalu panjang\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI yang buruk"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase yang buruk"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase yang buruk"
@@ -94,22 +94,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
@@ -150,7 +150,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "ubah passphrase"
@@ -163,7 +162,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -226,13 +225,13 @@ msgstr "passphrase tidak diulang dengan benar; coba lagi"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "menulis ke `%s'\n"
@@ -305,8 +304,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -413,7 +412,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -436,142 +435,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -588,55 +587,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Pilihan:\n"
+"  "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Silakan masukkan passphrase; ini kalimat rahasia\n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase yang buruk"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "kesalahan penciptaan passphrase: %s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Batal"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -672,7 +692,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -682,21 +702,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "y|ya"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -708,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -718,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -747,43 +767,43 @@ msgstr "ubah passphrase"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -1180,7 +1200,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1190,7 +1210,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "bagian kunci rahasia tidak tersedia\n"
@@ -1502,18 +1522,18 @@ msgstr "Perintah tidak valid (coba \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output tidak berfungsi untuk perintah ini\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "tidak dapat membuka `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1807,24 +1827,16 @@ msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "menggunakan kunci sekunder %08lX bukannya kunci primer %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "kunci %08lX: kunci rahasia tanpa kunci publik - dilewati\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Perintah:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1953,17 +1965,6 @@ msgstr "|algo [file]|cetak digest pesan"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Pilihan:\n"
-"  "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ciptakan output ascii"
@@ -2392,7 +2393,7 @@ msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
@@ -3117,12 +3118,12 @@ msgstr "kesalahan menulis keyring `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "%s: keyring tercipta\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "kesalahan penciptaan : `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "gagal membuat kembali cache keyring: %s\n"
@@ -3440,20 +3441,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Kunci ini tidak diproteksi.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Kunci diproteksi.\n"
 
@@ -3470,7 +3471,7 @@ msgstr ""
 "Masukkan passphrase baru untuk kunci rahasia ini.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase tidak diulang dengan benar; coba lagi"
 
@@ -4276,12 +4277,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "keysize dibulatkan hingga %u bit\n"
@@ -4421,7 +4422,7 @@ msgstr "Keysize yang diminta adalah %u bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "dibulatkan hingga %u bit\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4437,7 +4438,7 @@ msgstr ""
 "     <n>m = kunci berakhir dalam n bulan\n"
 "     <n>y = kunci berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4453,40 +4454,40 @@ msgstr ""
 "     <n>m = signature berakhir dalam n bulan\n"
 "     <n>y = signature berakhir dalam n tahun\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Kunci valid untuk? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signature valid untuk? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "nilai yang tidak valid\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s tidak pernah berakhir\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s berakhir pada %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signature kadaluarsa pada %s \n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4494,12 +4495,12 @@ msgstr ""
 "Sistem anda tidak dapat menampilkan tanggal melebihi 2038.\n"
 "Namun, ia dapat menanganinya secara benar hingga 2106.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Benar (y/t)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4510,7 +4511,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4526,44 +4527,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:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nama sebenarnya: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Karakter tidak valid dalam nama\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Nama tidak boleh dimulai dengan digit\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Nama harus berukuran minimum 5 karakter\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Alamat email: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Bukan alamat email yang valid\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Komentar: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Karakter tidak valid dalam komentar\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Anda menggunakan set karakter `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4573,7 +4574,7 @@ msgstr ""
 "Anda memilih USER-ID ini:\n"
 "   \"%s\"\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4588,23 +4589,23 @@ msgstr "Jangan menaruh alamat email ke dalam nama sebenarnya atau komentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Silakan perbaiki kesalahan ini dulu\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4612,12 +4613,12 @@ msgstr ""
 "Anda perlu sebuah passphrase untuk melindungi kunci rahasia anda.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4630,7 +4631,7 @@ msgstr ""
 "menggunakan program ini dengan pilihan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4642,50 +4643,50 @@ msgstr ""
 "selama pembuatan prima; ini akan memberi random number generator kesempatan\n"
 "yang baik untuk memperoleh entropi.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Pembuatan kunci dibatalkan.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "menulis kunci publik ke `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "tidak ditemukan keyring publik yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "tidak ditemukan keyring rahasia yang dapat ditulisi: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring publik `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "kunci publik dan rahasia dibuat dan ditandai.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4695,45 +4696,45 @@ msgstr ""
 "mungkin ingin menggunakan perintah \"--edit-key\" untuk membuat kunci kedua "
 "untuk tujuan ini.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Ingin diciptakan? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "CATATAN: kunci pribadi %08lX berakhir pada %s\n"
@@ -4793,45 +4794,45 @@ msgstr "     Fingerprint kunci ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "PERINGATAN: terdapat 2 file dengan informasi penting.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s adalah yang tidak berubah\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s adalah yang baru\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Silakan perbaiki kemungkinan lubang keamanan ini\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "memeriksa keyring `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kunci telah diperiksa (%lu signature)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: keyring tercipta\n"
@@ -4879,7 +4880,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opsi ekspor tidak valid\n"
@@ -4894,126 +4895,126 @@ msgstr "kunci '%s' tidak ditemukan: %s\n"
 msgid "key not found on keyserver\n"
 msgstr "kunci '%s' tidak ditemukan: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "ditandai dengan kunci anda %08lX pada %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "mencari \"%s\" dari server HKP %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "kesalahan keyserver"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "meminta kunci %08lX dari %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "PERINGATAN: tidak dapat menghapus file temp (%s) `%s': %s\n"
@@ -5378,7 +5379,7 @@ msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID kunci utama %08lX)"
@@ -5409,7 +5410,12 @@ msgstr "dibatalkan oleh user\n"
 msgid "problem with the agent: %s\n"
 msgstr "masalah dengan agen: agen mengembalikan 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "tidak diproses"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5419,12 +5425,12 @@ msgstr ""
 "Anda perlu passphrase untuk membuka kunci rahasia untuk\n"
 "pemakai: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, fuzzy, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit kunci %s, ID %08lX, tercipta %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6593,11 +6599,6 @@ 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"
@@ -6628,40 +6629,40 @@ msgstr "tidak dapat membuka file: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "kunci publik %08lX tidak ditemukan: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
@@ -6690,58 +6691,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "ubah passphrase"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
@@ -6761,15 +6772,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6799,7 +6810,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
@@ -6808,11 +6819,11 @@ msgstr "Pengiriman keyserver gagal: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6834,114 +6845,104 @@ msgstr "ubah passphrase"
 msgid "|A|Please enter the Admin PIN"
 msgstr "ubah passphrase"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Silakan pilih alasan untuk pembatalan:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "gagal membaca keyblock: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: kesalahan membaca record bebas: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' sudah dikompresi\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "buat sepasang kunci baru"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "gagal menghapus keyblok: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Pembuatan kunci gagal: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
@@ -7776,21 +7777,21 @@ msgstr "tidak dapat memparsing URI keyserver\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "tidak dapat menutup `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7813,7 +7814,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -7915,17 +7916,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritma proteksi %d%s tidak didukung\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "Gagal memeriksa signature yang dibuat: %s\n"
diff --git a/po/it.po b/po/it.po
index f4b09539a..967072a57 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -14,18 +14,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -34,7 +34,7 @@ msgstr "Inserisci la passphrase, cio
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -44,45 +44,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "riga troppo lunga\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "passphrase troppo lunga\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Carattere non valido nel nome\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI danneggiato"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "passphrase errata"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "passphrase errata"
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "cambia la passphrase"
@@ -161,7 +160,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -224,13 +223,13 @@ msgstr "passphrase non ripetuta correttamente; prova ancora"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "scrittura in `%s'\n"
@@ -303,8 +302,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -411,7 +410,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -434,142 +433,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,55 +585,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opzioni:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "passphrase errata"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Cancella"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -670,7 +690,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -680,21 +700,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "si|s�"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -706,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -716,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -745,43 +765,43 @@ msgstr "cambia la passphrase"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -1178,7 +1198,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1188,7 +1208,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "parti della chiave segreta non sono disponibili\n"
@@ -1501,18 +1521,18 @@ msgstr "Comando non valido  (prova \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output non funziona con questo comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "impossibile aprire `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1816,24 +1836,16 @@ msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "manca una subchiave segreta per la subchiave pubblica %08lX - ignorata\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "uso la chiave secondaria %08lX invece della chiave primaria %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chiave %08lX: chiave segreta senza chiave pubblica - saltata\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Comandi:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1962,17 +1974,6 @@ msgstr "|algo [files]|stampa tutti i message digests"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opzioni:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "crea un output ascii con armatura"
@@ -2398,7 +2399,7 @@ msgstr ""
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
@@ -3124,12 +3125,12 @@ msgstr "errore creando il portachiavi `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "portachiavi `%s' creato\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "errore creando `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "rebuild della cache del portachiavi fallito: %s\n"
@@ -3445,20 +3446,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Questa chiave non � protetta.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "La chiave � protetta.\n"
 
@@ -3475,7 +3476,7 @@ msgstr ""
 "Inserisci la nuova passphrase per questa chiave segreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "passphrase non ripetuta correttamente; prova ancora"
 
@@ -4289,12 +4290,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "dimensioni della chiave arrotondate a %u bit\n"
@@ -4434,7 +4435,7 @@ msgstr "La dimensione richiesta della chiave 
 msgid "rounded up to %u bits\n"
 msgstr "arrotondate a %u bit\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4450,7 +4451,7 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4466,40 +4467,40 @@ msgstr ""
 "      <n>m = la chiave scadr� dopo n mesi\n"
 "      <n>y = la chiave scadr� dopo n anni\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Chiave valida per? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Firma valida per? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valore non valido\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s non ha scadenza\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s scadr� il %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Questa firma scadr� il %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4507,12 +4508,12 @@ msgstr ""
 "Il tuo sistema non pu� mostrare date oltre il 2038.\n"
 "Comunque, sar� gestita correttamente fino al 2106.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "� giusto (s/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4523,7 +4524,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4540,44 +4541,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nome e Cognome: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Carattere non valido nel nome\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Il nome non pu� iniziare con una cifra\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Il nome deve essere lungo almeno 5 caratteri\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Indirizzo di Email: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "L'indirizzo di email non � valido\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Commento: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Carattere non valido nel commento\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Stai usando il set di caratteri `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4588,7 +4589,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4603,23 +4604,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:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Per favore correggi prima l'errore\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4627,12 +4628,12 @@ msgstr ""
 "Ti serve una passphrase per proteggere la tua chiave segreta.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4644,7 +4645,7 @@ msgstr ""
 "programma con l'opzione \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4656,50 +4657,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Generazione della chiave annullata.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scrittura della chiave pubblica in `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi pubblico scrivibile: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi segreto scrivibile: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi pubblico `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "chiavi pubbliche e segrete create e firmate.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4709,12 +4710,12 @@ msgstr ""
 "il comando \"--edit-key\" per generare una chiave secondaria per questo "
 "scopo.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4722,7 +4723,7 @@ msgstr ""
 "la chiave � stata creata %lu secondo nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4730,26 +4731,26 @@ msgstr ""
 "la chiave � stata creata %lu secondi nel futuro (salto nel tempo o problema\n"
 "con l'orologio)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Crea davvero? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "impossibile creare `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chiave %08lX scaduta il %s\n"
@@ -4809,45 +4810,45 @@ msgstr "     Impronta digitale ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ATTENZIONE: esistono due file con informazioni confidenziali.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � quello non modificato\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � quello nuovo\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Per favore risolvete questo possibile problema di sicurezza\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "controllo il portachiavi `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "Sono state controllate %lu chiavi (%lu firme)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: portachiavi creato\n"
@@ -4897,7 +4898,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "opzioni di esportazione non valide\n"
@@ -4912,32 +4913,32 @@ msgstr "chiave `%s' non trovata: %s\n"
 msgid "key not found on keyserver\n"
 msgstr "chiave `%s' non trovata: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
@@ -4945,94 +4946,94 @@ msgstr ""
 "firmata con la tua chiave %08lX il %s\n"
 "\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "cerco \"%s\" sul server HKP %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "errore del keyserver"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "richiedo la chiave %08lX a %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ATTENZIONE: impossibile cancellare il file temporaneo (%s) `%s': %s\n"
@@ -5402,7 +5403,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (key ID principale %08lX)"
@@ -5433,7 +5434,13 @@ msgstr "interrotto dall'utente\n"
 msgid "problem with the agent: %s\n"
 msgstr "problema con l'agent: ha restituito 0x%lx\n"
 
-#: g10/passphrase.c:566
+# ??? (Md)
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "non esaminato"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5443,12 +5450,12 @@ msgstr ""
 "Ti serve una passphrase per sbloccare la chiave segreta\n"
 "dell'utente: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6638,12 +6645,6 @@ 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"
@@ -6674,40 +6675,40 @@ msgstr "impossibile aprire il file: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "chiave pubblica %08lX non trovata: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
@@ -6736,58 +6737,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "cambia la passphrase"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "cambia la passphrase"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
@@ -6807,15 +6818,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6845,7 +6856,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
@@ -6854,11 +6865,11 @@ msgstr "invio al keyserver fallito: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6880,114 +6891,104 @@ msgstr "cambia la passphrase"
 msgid "|A|Please enter the Admin PIN"
 msgstr "cambia la passphrase"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Per favore scegli il motivo della revoca:\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "errore leggendo il keyblock: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: errore durante la lettura del record libero: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' � gi� compresso\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "genera una nuova coppia di chiavi"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, fuzzy, c-format
 msgid "failed to store the key: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "cancellazione del keyblock fallita: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Generazione della chiave fallita: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
@@ -7821,21 +7822,21 @@ msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "impossibile chiudere `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7858,7 +7859,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -7960,17 +7961,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "l'algoritmo di protezione %d%s non � gestito\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "controllo della firma creata fallito: %s\n"
diff --git a/po/ja.po b/po/ja.po
index a130650f6..fdb958afd 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "������ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,7 +37,7 @@ msgstr "
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "ͭ����: %s"
@@ -48,45 +48,45 @@ msgstr "ͭ
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "�Ԥ�Ĺ�����ޤ�"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "�ѥ��ե졼����Ĺ�����ޤ�\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "������MPI�Ǥ�"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "�ѥ��ե졼���������Ǥ�"
@@ -96,22 +96,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
@@ -152,7 +152,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
@@ -165,7 +164,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -228,13 +227,13 @@ msgstr "PIN
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: �ǥ��쥯�ȥ꡼���쥳���ɤν���ߥ��顼: %s\n"
@@ -307,8 +306,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -415,7 +414,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -438,142 +437,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/gpg-agent.c:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -590,55 +589,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"���ץ����:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "�ѥ��ե졼�������Ϥ��Ƥ����������������̩��ʸ�ϤΤ��ȤǤ� \n"
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "�ѥ��ե졼���������Ǥ�"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "�ѥ��ե졼���κ������顼: %s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "����󥻥�"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -674,7 +694,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -684,21 +704,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -710,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -720,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -749,43 +769,43 @@ msgstr "
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -1179,7 +1199,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
 
@@ -1188,7 +1208,7 @@ msgstr "
 msgid "This command is only available for version 2 cards\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "��̩��ʬ�������ޤ���\n"
@@ -1475,18 +1495,18 @@ msgstr "̵
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "��%s�פ������ޤ���\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "����%s�ɤ����Ĥ���ޤ���: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1767,24 +1787,16 @@ msgstr "--allow-non-selfsigned-uid
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "����%s��縰%s�����Ѥ��ޤ�\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "��%s: �������Τʤ���̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@���ޥ��:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1912,17 +1924,6 @@ msgstr "|
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"���ץ����:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ASCII���������������"
@@ -2346,7 +2347,7 @@ msgstr "--pgp2
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
@@ -3059,12 +3060,12 @@ msgstr "
 msgid "keyring `%s' created\n"
 msgstr "���ء�%s�פ��Ǥ��ޤ���\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "��%s�פκ������顼: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "���إ���å���κƹ��ۤ˼��Ԥ��ޤ���: %s\n"
@@ -3352,20 +3353,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "���θ����ݸ��Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, fuzzy
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "�縰����̩��ʬ�������ޤ���\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "�����ݸ��Ƥ��ޤ���\n"
 
@@ -3382,7 +3383,7 @@ msgstr ""
 "������̩���ο������ѥ��ե졼�������Ϥ��Ƥ���������\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "�ѥ��ե졼��������ȷ����֤��Ƥ��ޤ��󡣺����Ϥ��Ƥ�������"
 
@@ -4161,12 +4162,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "��Ĺ��%u�ӥåȤ˴ݤ�ޤ�\n"
@@ -4304,7 +4305,7 @@ msgstr "
 msgid "rounded up to %u bits\n"
 msgstr "%u�ӥåȤ˴ݤ�ޤ�\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4320,7 +4321,7 @@ msgstr ""
 "      <n>m = ���� n ����֤���λ\n"
 "      <n>y = ���� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4336,40 +4337,40 @@ msgstr ""
 "      <n>m = ��̾�� n ����֤���λ\n"
 "      <n>y = ��̾�� n ǯ�֤���λ\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "����ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "��̾��ͭ�����֤�? (0)"
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "̵������\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "%s��̵���¤Ǥ�\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s��%s����λ���ޤ�\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "���ν�̾��%s����λ�Ǥ�\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4377,11 +4378,11 @@ msgstr ""
 "���Υ����ƥ�Ǥϡ�2038ǯ�ʹߤ����դ�ɽ���Ǥ��ޤ��󤬡�\n"
 "2106ǯ�ޤǤʤ���������갷���ޤ���\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "������������Ǥ���? (y/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4392,7 +4393,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4408,44 +4409,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "��̾: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "̾����̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "̾��������ǻϤ�ƤϤ����ޤ���\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "̾����5ʸ���ʾ�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "�Żҥ᡼�롦���ɥ쥹: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "ͭ�����Żҥ᡼�롦���ɥ쥹�ǤϤ���ޤ���\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "������: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "�����Ȥ�̵����ʸ��������ޤ�\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "���ʤ���ʸ�������%s�פ�ȤäƤ��ޤ���\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4456,7 +4457,7 @@ msgstr ""
 "    ��%s��\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "�Żҥ᡼��Υ��ɥ쥹����̾�䥳���Ȥ�����ʤ��褦��\n"
 
@@ -4471,23 +4472,23 @@ msgstr "
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ��Ͻ�λ(Q)? "
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "̾��(N)��������(C)���Żҥ᡼��(E)���ѹ����ޤ���OK(O)����λ(Q)? "
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "�ޤ����顼�������Ƥ�������\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4495,12 +4496,12 @@ msgstr ""
 "��̩�����ݸ�뤿��˥ѥ��ե졼��������ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4512,7 +4513,7 @@ msgstr ""
 "�Ρ�--edit-key�ɥ��ץ����Ǥ��ĤǤ��ѹ��Ǥ��ޤ���\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4523,50 +4524,50 @@ msgstr ""
 "�Ȥ����ǥ������˥�����������Ȥ���¾�Τ��Ȥ򤹤�ȡ���������Ҥ�\n"
 "�𻨤����礭�ʤ���������������䤹���ʤ�Τǡ������ᤤ�����ޤ���\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "�������������ä���ޤ�����\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "��%s�פظ�������񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ������ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "����߲�ǽ����̩���ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "�������ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "��̩���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "����������̩�������������̾���ޤ�����\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4575,42 +4576,42 @@ msgstr ""
 "���θ��ϰŹ沽�ˤϻ��ѤǤ��ʤ����Ȥ����դ��Ƥ����������Ź沽��Ԥ��ˤϡ�\n"
 "��--edit-key�ɥ��ޥ�ɤ�Ȥä��������������Ƥ���������\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "���������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "����: v3���������κ����ϡ�OpenPGP��Ŭ�礷�ޤ���\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "�����˺������ޤ���? (y/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "�����ɤؤθ����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "�Хå����åס��ե������%s�פ������Ǥ��ޤ���: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "����: �����ɸ��ΥХå����åפ���%s�פ���¸����ޤ�\n"
@@ -4669,45 +4670,45 @@ msgstr "                 
 msgid "      Card serial no. ="
 msgstr "         �����ɤ����� ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "�ٹ�: ���Ѿ�����ä�2�ĤΥե����뤬¸�ߤ��ޤ���\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s���ѹ��Τʤ����Ǥ�\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s�Ͽ��������Ǥ�\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "��������Ū�ʰ�����η�٤������Ƥ�������\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "���ء�%s�פ򥭥�å��夷�ޤ�\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu�Ĥθ��ޤǥ���å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu�Ĥθ��򥭥�å���� (%lu�Ĥν�̾)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: ���ؤ��Ǥ��ޤ���\n"
@@ -4755,7 +4756,7 @@ msgstr "disabled"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "�ֹ�(s)��N)�����ޤ���Q)��ߤ����Ϥ��Ƥ������� >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "̵���ʸ������С����ץ��ȥ���Ǥ� (us %d!=handler %d)\n"
@@ -4769,121 +4770,121 @@ msgstr "
 msgid "key not found on keyserver\n"
 msgstr "�����������С��˸��Ĥ���ޤ���\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "��%s��%s���饵���С�%s���׵�\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "��%s��%s���׵�\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "��%s��%s������%s������\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "��%s��%s������\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "��%s�ɤ�%s�����С�%s���鸡��\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "��%s�ɤ򥵡��С�%s���鸡��\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "�������С�����������󤬤���ޤ���!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "�ٹ�: ���� (%s) ��GnuPG�θ������С����ϥ�ɥ�\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "�������С���VERSION���������ޤ���Ǥ���\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "���Τθ������С�������ޤ��� (���ץ����--keyserver��Ȥ��ޤ��礦)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "���ι��ۤǤϡ������������С��θƽФ��ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "�������С������������%s���ѤΥϥ�ɥ餬����ޤ���\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "����%s�פϡ��������С������������%s�פǥ��ݡ��Ȥ���Ƥ��ޤ���\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, fuzzy, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "gpgkeys_%s�ϡ��ϥ�ɥ�%d�Ǥ򥵥ݡ��Ȥ��ޤ���\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "�������С��Υ����ॢ����\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "�������С����������顼\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "�������С��̿����顼: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "��%s�ɸ�ID�ǤϤ���ޤ���: �ȤФ��ޤ�\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d�ܤθ���%s�������\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "�ٹ�: ��%s��%s��ͳ�Dz����Ǥ��ޤ���: %s\n"
@@ -5245,7 +5246,7 @@ msgstr "
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (�縰ID %s)"
@@ -5276,7 +5277,12 @@ msgstr "
 msgid "problem with the agent: %s\n"
 msgstr "����������Ȥ˾㳲: ����������Ȥ�0x%lx���ֵ�\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "̤����"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5285,12 +5291,12 @@ msgstr ""
 "���Υ桼��������̩���Υ��å���������ˤ�\n"
 "�ѥ��ե졼��������ޤ�:��%s��\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u�ӥå�%s��, ID %s�������դ�%s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (�縰ID %s ������)"
@@ -6416,11 +6422,6 @@ 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"
@@ -6451,40 +6452,40 @@ msgstr "
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "��%s�פ����%s�פؤΰ�ư�˼���: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "������%s�����Ĥ���ޤ���: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
@@ -6513,58 +6514,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN������Хå������顼���ᤷ�ޤ���: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "������PIN�μ������顼: %s\n"
@@ -6584,15 +6595,15 @@ msgstr "
 msgid "reading public key failed: %s\n"
 msgstr "�����ɽФ��˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr "�����˸������ǡ������ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr "������RSA��ˡ(modulus)���ޤޤ�Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "������RSA�����ؿ����ޤޤ�Ƥ��ޤ���\n"
 
@@ -6622,7 +6633,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d�θ��ڤ˼��Ԥ��ޤ���: %s\n"
@@ -6631,11 +6642,11 @@ msgstr "CHV%d
 msgid "access to admin commands is not configured\n"
 msgstr "�������ޥ�ɤؤΥ���������������ꤵ��Ƥ��ޤ���\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr "�����ɤ����CHV���֤θ����ǥ��顼\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "�����ɤ��ʵפ˥��å�����ޤ�!\n"
 
@@ -6657,111 +6668,101 @@ msgstr "PIN [
 msgid "|A|Please enter the Admin PIN"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "PIN [��̾��: %lu]"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "CHV%d��PIN��û�����ޤ�����û��%d\n"
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 #, fuzzy
 msgid "|AN|New Admin PIN"
 msgstr "|A|������Admin PIN"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 #, fuzzy
 msgid "|N|New PIN"
 msgstr "������PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "���ץꥱ������󡦥ǡ������ɽФ����顼\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "����ǡ��������֥������Ȥ��ɽФ����顼\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "���Ϥ⤦����ޤ�\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "��¸�θ��ϸ򴹤���ޤ�\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "��������������\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "�����ؿ����礭�����ޤ� (32�ӥåȤ����)\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "�����ݴɤ˼��Ԥ��ޤ���: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "�������δ֡����Ԥ��������� ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "���������˼��Ԥ��ޤ���\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "������������λ���ޤ��� (%d��)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "OpenPGP�����ɤ�̵���ʹ�¤ (�ǡ��������֥������� 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s��̾�����󥢥르�ꥺ�� %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "����ޤǤ˺������줿��̾: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s�˥��������Ǥ��ޤ��� - ̵����OpenPGP������?\n"
@@ -7597,21 +7598,21 @@ msgstr "
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "��%s�פ˥��������Ǥ��ޤ���: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7634,7 +7635,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "���֤μ������顼: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -7736,17 +7737,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "�ݸ�르�ꥺ��%d%s�ϥ��ݡ��Ȥ��Ƥ��ޤ���\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "�������줿��̾�θ����˼��Ԥ��ޤ���: %s\n"
diff --git a/po/nb.po b/po/nb.po
index 528f3c201..d5083226c 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "klarte ikke � lagre fingeravtrykket: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -37,7 +37,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "gyldighet: %s"
@@ -48,45 +48,45 @@ msgstr "gyldighet: %s"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "for lang linje"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Ugyldig tegn i navn\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "ugyldig MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "ugyldig passfrase"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "ugyldig passfrase"
@@ -96,22 +96,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
@@ -152,7 +152,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "endre passfrasen"
@@ -165,7 +164,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -228,13 +227,13 @@ msgstr "PIN ble ikke gjentatt korrekt; pr
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
@@ -307,8 +306,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -415,7 +414,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -438,140 +437,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -588,52 +587,73 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Valg:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr ""
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr ""
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "ugyldig passfrase"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancel|cancel"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -669,7 +689,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -679,21 +699,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ja"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -705,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -715,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -744,43 +764,43 @@ msgstr "endre passfrasen"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "feil ved henting av n�v�rende n�kkelinfo: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -1167,7 +1187,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1176,7 +1196,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr ""
 
@@ -1462,18 +1482,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan ikke �pne �%s�\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "n�kkelen �%s� ble ikke funnet: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1760,24 +1780,16 @@ msgstr "Ugyldig n
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "bruker undern�kkel %s i stedet for prim�rn�kkel %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel uten offentlig n�kkel - hoppet over\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Kommandoer:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1905,17 +1917,6 @@ msgstr "|algo [filer]|skrive meldingsdigester"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Valg:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "lage ASCII-beskyttet output"
@@ -2336,7 +2337,7 @@ msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
@@ -3043,12 +3044,12 @@ msgstr "feil ved opprettelse av n
 msgid "keyring `%s' created\n"
 msgstr "n�kkelknippet �%s� ble opprettet\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "n�kkelblokkressurs �%s�: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr ""
@@ -3334,19 +3335,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Denne n�kkelen er ikke beskyttet.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "N�kkelen er beskyttet.\n"
 
@@ -3361,7 +3362,7 @@ msgid ""
 "\n"
 msgstr "Tast inn den nye passfrasen for denne hemmelige n�kklen.\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "passfrasen ble ikke gjentatt korrekt; pr�v igjen"
 
@@ -4095,12 +4096,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "n�kkelst�rrelsen ble rundet opp til %u bits\n"
@@ -4242,7 +4243,7 @@ msgstr "
 msgid "rounded up to %u bits\n"
 msgstr "rundet opp til %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4258,7 +4259,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:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4274,38 +4275,38 @@ msgstr ""
 "      <n>m = signaturen utg�r om n months\n"
 "      <n>y = signaturen utg�r om n years\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "N�kkelen er gyldig for? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen er gyldig for? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "ugyldig verdi\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "N�kkel utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen utg�r ikke i det hele tatt\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "N�kkel utg�r den %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen utg�r den %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4313,11 +4314,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Er dette korrekt (j/N)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4328,7 +4329,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4344,44 +4345,44 @@ msgstr ""
 "    �Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>�\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Fullt navn: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Ugyldig tegn i navn\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Navnet kan ikke starte med et siffer\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Navnet m� v�re minst 5 tegn langt\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Epostadresse: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Ikke en gyldig epostadresse\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Ugyldig tegn i kommentar\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du bruker tegnsettet �%s�.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4392,7 +4393,7 @@ msgstr ""
 "    �%s�\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
@@ -4408,23 +4409,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnKeEeRrAa"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Vennligst korriger feilen f�rst\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4432,12 +4433,12 @@ msgstr ""
 "Du trenger en passfrase for � beskytte din hemmelige n�kkel.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4449,7 +4450,7 @@ msgstr ""
 "hjelp av dette programmet og valget �--edit-key�.\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4461,50 +4462,50 @@ msgstr ""
 "diskene jobbe) under primtallgenereringen; dette gir\n"
 "tilfeldig-tall-generatoren en bedre sjanse til � samle nok entropy.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "N�kkelgenereringen ble avbrutt.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver offentlig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver forel�pig hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbart offentlig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbart hemmelig n�kkelknippe ble funnet: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "feil ved skriving av offentlig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "feil ved skriving av hemmelig n�kkelknippe �%s�: %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "offentlig og hemmelig n�kkel opprettet og signert.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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,13 +4514,13 @@ msgstr ""
 "kanskje � bruke kommandoen �--edit-key� for � generere en\n"
 "sekund�rn�kkel for dette form�let.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "N�kkelgenerering mislyktes: %s\n"
 
 # Er dette entallsformen av denne strengen?
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4528,7 +4529,7 @@ msgstr ""
 "klokkeproblem)\n"
 
 # Er dette flertallsformen av denne og den forrige strengen?
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4536,27 +4537,27 @@ msgstr ""
 "n�kkel har blitt opprettet %lu sekunder i fremtiden (time warp eller "
 "klokkeproblem)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Virkelig opprette? (j/N)"
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "lagring av n�kkel p� kort mislyktes: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan ikke opprette sikkerhetskopifil �%s�: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr ""
@@ -4615,45 +4616,45 @@ msgstr " N
 msgid "      Card serial no. ="
 msgstr "      Serienummer for kort ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ADVARSEL: 2 filer med konfidensiell informasjon finnes.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr ""
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr ""
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr ""
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "cacher n�kkelknippet �%s�\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu n�kler cachet s� langt (%lu signaturer)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu n�kler cachet (%lu signaturer)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr ""
@@ -4700,7 +4701,7 @@ msgstr "utkoblet"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr ""
@@ -4714,121 +4715,121 @@ msgstr "n
 msgid "key not found on keyserver\n"
 msgstr "n�kkelen ble ikke funnet p� n�kkelserver\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "ber om n�kkelen %s fra %s server %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "ber om n�kkel %s fra %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "s�ke etter navn fra %s server %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "s�ker etter navn fra %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "s�ke etter �%s� fra %s server %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "s�ker etter �%s� fra %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "ingen handling for n�kkelserver!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "n�kkelserver sendte ikke VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "n�kkelserver svarte ikke tidsnok\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "intern feil ved n�kkelserver\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikasjonsfeil med n�kkelserver: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � oppfriske n�kkel %s via %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "oppfrisker 1 n�kkel fra %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "oppfrisker %d n�kler fra %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ADVARSEL: klarte ikke � fange URI %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ADVARSEL: klarte ikke � parse URI %s\n"
@@ -5190,7 +5191,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (hovedn�kkelid %s)"
@@ -5221,7 +5222,12 @@ msgstr ""
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "ikke tvunget"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5230,12 +5236,12 @@ msgstr ""
 "Du trenger en passfrase for � l�se opp den hemmelige n�kkelen for\n"
 "brukeren: �%s�\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bit %s-n�kkel, ID %s, opprettet %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6353,11 +6359,6 @@ 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"
@@ -6388,40 +6389,40 @@ msgstr "signering mislyktes: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "omd�ping fra �%s� til �%s� mislyktes: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "venter p� l�sing av �%s� ...\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "fant ikke offentlig n�kkel %s: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "venter p� l�sing av �%s� ...\n"
@@ -6450,58 +6451,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-callback returnerte en feil: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "feil ved henting av ny PIN: %s\n"
@@ -6521,15 +6532,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "respons inneholder ikke den offentlige RSA-eksponenten\n"
 
@@ -6559,7 +6570,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "bekreftelse av CHV%d mislyktes: %s\n"
@@ -6568,11 +6579,11 @@ msgstr "bekreftelse av CHV%d mislyktes: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "tilgang til admin-kommandoer er ikke konfigurert\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "kort er permanent l�st!\n"
 
@@ -6594,109 +6605,99 @@ msgstr "||Vennligst tast inn PIN%%0A[signaturer utf
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Vennligst tast inn PIN%%0A[signaturer utf�rt: %lu]"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "feil ved lesing av applikasjonsdata\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "feil ved lesing av fingeravtrykk DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "n�kkel finnes allerede\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "eksisterende n�kkel vil bli erstattet\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "generere en ny n�kkel\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "tidsstempel for opprettelse mangler\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA-modulus mangler eller har ikke en st�rrelse p� %d bits\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "offentlig RSA-eksponent mangler eller er st�rre enn %d bits\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "klarte ikke � lagre n�kkelen: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "vennligst vent mens n�kkel blir generert ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "n�kkelgenerering mislyktes\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "n�kkelgenerering fullf�rt (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ugyldig struktur i OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kortet st�tter ikke digestalgoritme %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer opprettet s� langt: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan ikke aksere %s - ugyldig OpenPGP-kort?\n"
@@ -7528,21 +7529,21 @@ msgstr "kunne ikke parse n
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan ikke aksere �%s�: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7565,7 +7566,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -7667,17 +7668,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index a86df30a5..0ee5a1339 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -19,18 +19,18 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nie uda�o si� uzyska� blokady pinentry: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 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:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -39,7 +39,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "poprawno��: %s"
@@ -50,40 +50,40 @@ msgstr "poprawno
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (pr�ba %d z %d)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "PIN zbyt d�ugi"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "Has�o zbyt d�ugie"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "Niew�a�ciwy znak w PIN-ie"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "PIN zbyt kr�tki"
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 msgid "Bad PIN"
 msgstr "Niepoprawny PIN"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 msgid "Bad Passphrase"
 msgstr "Niepoprawne has�o"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "Has�o"
 
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nie mo�na otworzy� ,,%s'': %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "Prosz� ponownie wprowadzi� to has�o"
 
@@ -162,7 +161,7 @@ msgstr ""
 "%0A w miejscu przechowywania kluczy gpg-agenta"
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "nie pasuj� - prosz� spr�bowa� jeszcze raz"
 
@@ -223,13 +222,13 @@ msgstr "PIN nie powt
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "b��d tworzenia pliku tymczasowego: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "b��d zapisu do pliku tymczasowego: %s\n"
@@ -315,8 +314,8 @@ msgstr "Prosz
 msgid "Please enter the new passphrase"
 msgstr "Prosz� wprowadzi� nowe has�o"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -416,7 +415,7 @@ msgstr "w
 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:146
+#: 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
 msgid "Please report bugs to <"
@@ -439,140 +438,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� gniazda: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() nie powiod�o si�: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, 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:1749
+#: agent/gpg-agent.c:1752
 #, 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:1769
+#: agent/gpg-agent.c:1772
 #, 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:1774
+#: agent/gpg-agent.c:1777
 #, 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:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -591,11 +590,32 @@ msgstr ""
 "Sk�adnia: gpg-preset-passphrase [opcje] UCHWYT_KLUCZA\n"
 "Utrzymuwanie pami�ci hase�\n"
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Opcje:\n"
+" "
+
+#: agent/protect-tool.c:162
 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -603,22 +623,22 @@ msgstr ""
 "Sk�adnia: gpg-protect-tool [opcje] [argumenty]\n"
 "Narz�dzie do utrzymywania kluczy tajnych\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 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:1199
+#: agent/protect-tool.c:1155
 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:1202
+#: agent/protect-tool.c:1161
 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:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -626,19 +646,19 @@ msgstr ""
 "Prosz� wprowadzi� has�o lub PIN\n"
 "Potrzebny do zako�czenia tej operacji."
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Has�o:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "anulowano\n"
+
+#: agent/protect-tool.c:1178 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/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "anulowano\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -674,7 +694,7 @@ msgstr "nieprawid
 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:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "b��d odczytu listy zaufanych certyfikat�w g��wnych\n"
 
@@ -684,9 +704,9 @@ msgstr "b
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -695,11 +715,11 @@ msgstr ""
 "Czy absolutnie ufasz, �e%%0A  ,,%s''%%0Apoprawnie po�wiadcza certyfikaty "
 "u�ytkownik�w?"
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "Tak"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "Nie"
 
@@ -711,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -723,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "Akceptuj"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -752,43 +772,43 @@ msgstr "Zmiana has
 msgid "I'll change it later"
 msgstr "Zmieni� je p�niej"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "b��d tworzenia potoku: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na wykona� fdopen do odczytu na potoku: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d podczas tworzenia procesu: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d odczytu kodu zako�czenia procesu %d: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "b��d uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d uruchamiania ,,%s'': zako�czono\n"
@@ -1180,7 +1200,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1189,7 +1209,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajne cz�ci klucza s� niedost�pne\n"
@@ -1476,18 +1496,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nie mo�na otworzy� ,,%s''\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "klucz ,,%s'' nie zosta� odnaleziony: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1773,24 +1793,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %s - pomini�ty\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "u�ywany jest podklucz %s zamiast klucza g��wnego %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "klucz %s: klucz tajny bez klucza jawnego - pomini�ty\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Polecenia:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1918,17 +1930,6 @@ msgstr "|algo [pliki]|skr
 msgid "run in server mode"
 msgstr "uruchomienie w trybie serwera"
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Opcje:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "opakowanie ASCII pliku wynikowego"
@@ -2364,7 +2365,7 @@ msgstr "szyfrowanie wiadomo
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
@@ -3081,12 +3082,12 @@ msgstr "b
 msgid "keyring `%s' created\n"
 msgstr "zbi�r kluczy ,,%s'' zosta� utworzony\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "zas�b bloku klucza `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "nie powiod�a si� odbudowa bufora bazy: %s\n"
@@ -3382,19 +3383,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Ten klucz nie jest chroniony.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Klucz jest chroniony.\n"
 
@@ -3411,7 +3412,7 @@ msgstr ""
 "Wprowad� nowe d�ugie, skomplikowane has�o dla tego klucza tajnego.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "has�o nie zosta�o poprawnie powt�rzone; jeszcze jedna pr�ba"
 
@@ -4185,12 +4186,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "rozmiar klucza zaokr�glony w g�r� do %u bit�w\n"
@@ -4330,7 +4331,7 @@ msgstr "
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�glono do %u bit�w\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4346,7 +4347,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:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4362,38 +4363,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:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Okres wa�no�ci klucza? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Okres wa�no�ci podpisu? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "niepoprawna warto��\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Klucz nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Podpis nie wyga�nie w og�le\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Klucz traci wa�no�� %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Wa�no�� podpisu wygasa %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4401,11 +4402,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Czy wszystko si� zgadza (t/N)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4416,7 +4417,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4432,44 +4433,44 @@ msgstr ""
 "    \"Tadeusz �ele�ski (Boy) <tzb@ziemianska.pl>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Imi� i nazwisko: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Niew�a�ciwy znak w imieniu lub nazwisku\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Imi� lub nazwisko nie mo�e zaczyna� si� od cyfry\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 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:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Adres poczty elektronicznej: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "To nie jest poprawny adres poczty elektronicznej\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Komentarz: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Niew�a�ciwy znak w komentarzu\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "U�ywasz zestawu znak�w %s.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4480,7 +4481,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
@@ -4497,25 +4498,25 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "IiKkEeDdWw"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Najpierw trzeba poprawi� ten b��d\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4523,12 +4524,12 @@ msgstr ""
 "Musisz poda� d�ugie, skomplikowane has�o aby ochroni� sw�j klucz tajny.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4540,7 +4541,7 @@ msgstr ""
 "\"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4556,50 +4557,50 @@ msgstr ""
 "ilo�ci\n"
 "entropii.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Procedura generacji klucza zosta�a anulowana.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisuj� klucz publiczny w ,,%s''\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisuj� za�lepk� klucza tajnego w ,,%s''\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisuj� klucz tajny w ,,%s''\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy publicznych: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy tajnych: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy publicznych ,,%s'': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "b��d podczas zapisu zbioru kluczy tajnych ,,%s'': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "klucz publiczny i prywatny (tajny) zosta�y utworzone i podpisane.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4607,12 +4608,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generacja klucza nie powiod�a si�: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4620,7 +4621,7 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund� w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4628,26 +4629,26 @@ msgstr ""
 "klucz zosta� stworzony %lu sekund w przysz�o�ci (zaburzenia\n"
 "czasoprzestrzeni, lub �le ustawiony zegar systemowy)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Czy na pewno utworzy�? (t/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zapis klucza na karcie nie powi�d� si�: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, 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:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "UWAGA: kopia zapasowa klucza karty zapisana do ,,%s''\n"
@@ -4706,45 +4707,45 @@ msgstr "       Odcisk klucza ="
 msgid "      Card serial no. ="
 msgstr "    Nr seryjny karty ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "zmiana nazwy ,,%s'' na ,,%s'' nie powiod�a si�: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "OSTRZE�ENIE: Istniej� dwa pliki z poufnymi informacjami.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s pozosta� bez zmian\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s zosta� utworzony\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Prosz� usun�� to naruszenie zasad bezpiecze�stwa\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "buforowanie zbioru kluczy ,,%s''\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu kluczy zbuforowano do tej pory (%lu podpis�w)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu kluczy zbuforowano (%lu podpis�w)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: zbi�r kluczy utworzony\n"
@@ -4794,7 +4795,7 @@ msgstr "wy
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Wprowad� numer(y), N)ast�pny lub Q)uit > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "niepoprawny protok� serwera kluczy (nasz %d != modu� obs�ugi %d)\n"
@@ -4808,123 +4809,123 @@ msgstr "klucz ,,%s'' nie zosta
 msgid "key not found on keyserver\n"
 msgstr "klucz nie zosta� odnaleziony na serwerze kluczy\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "zapytanie o klucz %s z serwera %s %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "zapytanie o klucz %s z %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "poszukiwanie nazw z serwera %s %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "poszukiwanie nazw z %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "wysy�anie klucza %s na serwer %s %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "wysy�anie klucza %s na %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "poszukiwanie ,,%s'' z serwera %s %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "poszukiwanie ,,%s'' z %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "brak akcji serwera kluczy!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "OSTRZE�ENIE: modu� obs�ugi serwera kluczy z innej wersji GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "serwer kluczy nie wys�a� VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "brak znanyk serwer�w kluczy (u�yj opcji --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "zewn�trzne wywo�ania serwera kluczy nie s� obs�ugiwane w tej kompilacji\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "brak modu�u obs�ugi dla schematu serwera kluczy ,,%s''\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 "akcja ,,%s'' nie jest obs�ugiwana przez schemat serwera kluczy ,,%s''\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nie obs�uguje modu�u obs�ugi w wersji %d\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "zbyt d�ugi czas oczekiwania na serwer kluczy\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "b��d wewn�trzny serwera kluczy\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "b��d komunikacji z serwerem kluczy: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ",,%s'' nie jest identyfikatorem klucza - pomini�to\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na od�wie�y� klucza %s przez %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "od�wie�anie 1 klucza z %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "od�wie�anie %d kluczy z %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na pobra� URI %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "OSTRZE�ENIE: nie mo�na przeanalizowa� URI %s\n"
@@ -5291,7 +5292,7 @@ msgstr ""
 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:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID g��wnego klucza %s)"
@@ -5322,7 +5323,12 @@ msgstr "anulowano przez u
 msgid "problem with the agent: %s\n"
 msgstr "problem z agentem: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "[B��d - brak pami�ci]"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5331,12 +5337,12 @@ msgstr ""
 "Musisz poda� has�o aby odbezpieczy� klucz prywatny u�ytkownika:\n"
 ",,%s''\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (podklucz dla g��wnego klucza o ID %s)"
@@ -6489,11 +6495,6 @@ 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"
@@ -6524,40 +6525,40 @@ msgstr "iconv_open nie powiod
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konwersja z ,,%s'' do ,,%s'' nie powiod�a si�: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu tymczasowego,,%s'': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "b��d zapisu do %s: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr ""
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "klucz publiczny %s nie odnaleziony: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
@@ -6586,58 +6587,68 @@ msgstr ""
 "Sk�adnia: kbxutil [opcje] [pliki]\n"
 "wypisywanie, eksport, import danych Keybox\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "Zapytanie zwrotne o PIN zwr�ci�o b��d: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN nie zosta� jeszcze zmieniony\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||Prosz� wprowadzi� PIN na klawiaturze czytnika"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
@@ -6657,15 +6668,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "odpowied� nie zawiera publicznego wyk�adnika RSA\n"
 
@@ -6695,7 +6706,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "weryfikacja CHV%d nie powiod�a si�: %s\n"
@@ -6704,11 +6715,11 @@ msgstr "weryfikacja CHV%d nie powiod
 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:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "karta zosta�a trwale zablokowana!\n"
 
@@ -6731,110 +6742,100 @@ msgstr ""
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Prosz� wpisa� PIN%%0A[podpis�w wykonanych: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "Prosz� wprowadzi� PIN%s%s%s aby odblokowa� kart�"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Nowy PIN administratora"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Nowy PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "b��d podczas odczytu danych aplikacji\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "b��d podczas odczytu odcisku DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "klucz ju� istnieje\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "istniej�cy klucz zostanie zast�piony\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "generowanie nowego klucza\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "brak datownika utworzenia\n"
 
-#: scd/app-openpgp.c:2371
-#, 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-openpgp.c:2383
-#, 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-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "nie powi�d� si� zapis klucza: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "prosz� czeka� na wygenerowanie klucza...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "generowanie klucza nie powiod�o si�\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generowanie klucza zako�czone (%d sekund)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "niepoprawna struktura karty OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr "odcisk na karcie nie zgadza si� z ��danym\n"
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, 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:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "dotychczas stworzono podpis�w: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nie mo�na dosta� si� do %s - niepoprawna karta OpenPGP?\n"
@@ -7639,21 +7640,21 @@ msgstr "niezrozumia
 msgid "WARNING: running with faked system time: "
 msgstr "OSTRZE�ENIE: dzia�anie z fa�szywym czasem systemowym: "
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "import wsp�lnych certyfikat�w ,,%s''\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nie mo�na podpisa� z u�yciem ,,%s'': %s\n"
 
-#: sm/gpgsm.c:1717
+#: 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:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7676,7 +7677,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "b��d importu certyfikatu: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "b��d odczytu wej�cia: %s\n"
@@ -7788,17 +7789,17 @@ msgstr ""
 ",,%s''\n"
 "Nale�y zauwa�y�, �e ten certyfikat NIE utworzy kwalifikowanego podpisu!"
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algorytm ochrony %d%s nie jest obs�ugiwany\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sprawdzenie certyfikatu kwalifikowanego nie powiod�o si�: %s\n"
diff --git a/po/pt.po b/po/pt.po
index 386e58291..a6710ed90 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -17,18 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 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:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -37,7 +37,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -47,45 +47,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "frase secreta demasiado longa\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter inv�lido no nome\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorrecta"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorrecta"
@@ -95,22 +95,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -151,7 +151,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
@@ -164,7 +163,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -227,13 +226,13 @@ msgstr "a frase secreta n
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "a escrever para `%s'\n"
@@ -306,8 +305,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -415,7 +414,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -438,142 +437,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 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:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -590,55 +589,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Op��es:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorrecta"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "cancelado pelo utilizador\n"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -674,7 +694,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -684,21 +704,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -710,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -720,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -749,43 +769,43 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1183,7 +1203,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1193,7 +1213,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "partes da chave secreta n�o dispon�veis\n"
@@ -1505,18 +1525,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1809,24 +1829,16 @@ msgstr "Chave inv
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Comandos:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1955,17 +1967,6 @@ msgstr "|algo [ficheiros]|imprimir \"digests\" de mensagens"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Op��es:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
@@ -2393,7 +2394,7 @@ msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
@@ -3118,12 +3119,12 @@ msgstr "erro ao criar porta-chaves `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "porta-chaves `%s' criado\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "erro ao criar `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "falha ao criar 'cache' do porta-chaves: %s\n"
@@ -3439,20 +3440,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3469,7 +3470,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "a frase secreta n�o foi repetida corretamente; tente outra vez"
 
@@ -4273,12 +4274,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "tamanho da chave arredondado para %u bits\n"
@@ -4418,7 +4419,7 @@ msgstr "O tamanho de chave pedido 
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4434,7 +4435,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4450,40 +4451,40 @@ msgstr ""
 "      <n>m = assinatura expira em n meses\n"
 "      <n>y = assinatura expira em n anos\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A assinatura � valida por? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A %s n�o expira nunca\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "%s expira em %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4491,12 +4492,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4507,7 +4508,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4525,44 +4526,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Caracter inv�lido no nome\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 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:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Caracter inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4573,7 +4574,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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 "
@@ -4590,23 +4591,23 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Por favor corrija primeiro o erro\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4614,12 +4615,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger a sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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 +4632,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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 +4644,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "a escrever chave p�blica para `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, 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:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4695,12 +4696,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4708,7 +4709,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4716,26 +4717,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou em %s\n"
@@ -4795,45 +4796,45 @@ msgstr "  Impress
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 ficheiros com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte esta poss�vel falha de seguran�a\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "a verificar o porta chaves `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chave verificadas (%lu assinaturas)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: porta-chaves criado\n"
@@ -4881,7 +4882,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "op��es de exporta��o inv�lidas\n"
@@ -4896,126 +4897,126 @@ msgstr "chave `%s' n
 msgid "key not found on keyserver\n"
 msgstr "chave `%s' n�o encontrada: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com a sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "a procurar por \"%s\" no servidor HKP %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro do servidor de chaves"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "a pedir a chave %08lX de %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVISO: dono pouco seguro em %s \"%s\"\n"
@@ -5389,7 +5390,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
@@ -5422,7 +5423,12 @@ msgstr "cancelado pelo utilizador\n"
 msgid "problem with the agent: %s\n"
 msgstr "problema com o agente: o agente returnou 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "n�o processado"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5432,12 +5438,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "utilizador: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6605,11 +6611,6 @@ 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"
@@ -6640,40 +6641,40 @@ msgstr "imposs
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "chave p�blica %08lX n�o encontrada: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "a escrever chave privada para `%s'\n"
@@ -6702,58 +6703,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revoca��o: "
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "motivo da revoca��o: "
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 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"
@@ -6773,15 +6784,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6811,7 +6822,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -6820,11 +6831,11 @@ msgstr "A gera
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6846,114 +6857,104 @@ msgstr "muda a frase secreta"
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "motivo da revoca��o: "
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura do bloco de chave: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro ao ler registo livre: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%s' j� comprimido\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "remo��o do bloco de chave falhou: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -7792,21 +7793,21 @@ msgstr "n
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel fechar `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7829,7 +7830,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7931,17 +7932,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritmo de protec��o %d%s n�o � suportado\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verifica��o da assinatura criada falhou: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ee221ea5d..e05c0fdc3 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -21,18 +21,18 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 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:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -41,7 +41,7 @@ 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:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -51,45 +51,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "linha muito longa\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caractere inv�lido no nome\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorreto"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "frase secreta incorreta"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "frase secreta incorreta"
@@ -99,22 +99,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
@@ -155,7 +155,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "muda a frase secreta"
@@ -168,7 +167,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -232,13 +231,13 @@ msgstr "A frase secreta n
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
@@ -311,8 +310,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -419,7 +418,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -442,140 +441,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 common/asshelp.c:326
 #: tools/gpg-connect-agent.c:2133
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -592,54 +591,75 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Op��es:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Por favor digite a frase secreta"
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "frase secreta incorreta"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr ""
+
+#: agent/protect-tool.c:1178 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/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr ""
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -675,7 +695,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -685,21 +705,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "sim"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -711,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -721,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -750,43 +770,43 @@ msgstr "muda a frase secreta"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -1189,7 +1209,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1198,7 +1218,7 @@ msgstr "imposs
 msgid "This command is only available for version 2 cards\n"
 msgstr ""
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "a chave p�blica n�o est� mais dispon�vel"
@@ -1512,18 +1532,18 @@ msgstr "Comando inv
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "imposs�vel abrir `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1812,24 +1832,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "usando chave secund�ria %08lX ao inv�s de chave prim�ria %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Comandos:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1964,17 +1976,6 @@ msgstr "imprime todos os \"digests\" de mensagens"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Op��es:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "criar sa�da com armadura ascii"
@@ -2402,7 +2403,7 @@ msgstr ""
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
@@ -3135,12 +3136,12 @@ msgstr "erro na escrita do chaveiro `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "%s: chaveiro criado\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "%s: erro de leitura de bloco de chaves: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, fuzzy, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "%s: falha ao criar tabela de \"hash\": %s\n"
@@ -3442,21 +3443,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "A chave � protegida.\n"
 
@@ -3473,7 +3474,7 @@ msgstr ""
 "Digite a nova frase para esta chave secreta.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 #, fuzzy
 msgid "passphrase not correctly repeated; try again"
 msgstr "A frase secreta n�o foi repetida corretamente; tente outra vez.\n"
@@ -4277,12 +4278,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, fuzzy, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
@@ -4422,7 +4423,7 @@ msgstr "O tamanho de chave pedido 
 msgid "rounded up to %u bits\n"
 msgstr "arredondado para %u bits\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4438,7 +4439,7 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 #, fuzzy
 msgid ""
 "Please specify how long the signature should be valid.\n"
@@ -4455,40 +4456,40 @@ msgstr ""
 "      <n>m = chave expira em n meses\n"
 "      <n>y = chave expira em n anos\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "A chave � valida por? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valor inv�lido\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "A chave n�o expira nunca\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "A chave expira em %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4496,12 +4497,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Est� correto (s/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4512,7 +4513,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4529,44 +4530,44 @@ msgstr ""
 "    \"Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nome completo: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Caractere inv�lido no nome\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 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:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "O nome deve ter pelo menos 5 caracteres\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Endere�o de correio eletr�nico: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Endere�o eletr�nico inv�lido\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Coment�rio: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Caractere inv�lido no coment�rio\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Voc� est� usando o conjunto de caracteres `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4577,7 +4578,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr ""
 
@@ -4592,24 +4593,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoSs"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 #, 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr ""
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4617,12 +4618,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para proteger sua chave.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr ""
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4634,7 +4635,7 @@ msgstr ""
 "qualquer hora, usando este programa com a op��o \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4646,50 +4647,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Gera��o de chave cancelada.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, fuzzy, c-format
 msgid "writing public key to `%s'\n"
 msgstr "escrevendo certificado p�blico para `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, fuzzy, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, fuzzy, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, fuzzy, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, fuzzy, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "chaves p�blica e privada criadas e assinadas.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4698,12 +4699,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4711,7 +4712,7 @@ msgstr ""
 "a chave foi criada %lu segundo no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4719,26 +4720,26 @@ msgstr ""
 "a chave foi criada %lu segundos no futuro\n"
 "(viagem no tempo ou problema no rel�gio)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr ""
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Realmente criar? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, fuzzy, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "NOTA: chave secreta %08lX expirou %s\n"
@@ -4806,45 +4807,45 @@ msgstr "       Impress
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVISO: existem 2 arquivos com informa��es confidenciais.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s � o n�o modificado\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s � o novo\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Por favor conserte este poss�vel furo de seguran�a\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "listar as chaves e as assinaturas"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: chaveiro criado\n"
@@ -4892,7 +4893,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "chaveiro inv�lido"
@@ -4907,126 +4908,126 @@ msgstr "usu
 msgid "key not found on keyserver\n"
 msgstr "usu�rio `%s' n�o encontrado: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr ""
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "assinado com sua chave %08lX em %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "exportar chaves para um servidor"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "erro geral"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, fuzzy, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "%s n�o � um mapa de caracteres v�lido\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "%s: novo arquivo de op��es criado\n"
@@ -5396,7 +5397,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (ID principal da chave %08lX)"
@@ -5429,7 +5430,12 @@ msgstr ""
 msgid "problem with the agent: %s\n"
 msgstr ""
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "n�o processado(s)"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5439,12 +5445,12 @@ msgstr ""
 "Voc� precisa de uma frase secreta para desbloquear a chave secreta do\n"
 "usu�rio: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6610,11 +6616,6 @@ 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"
@@ -6645,40 +6646,40 @@ msgstr "imposs
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "chave p�blica n�o encontrada"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "escrevendo certificado privado para `%s'\n"
@@ -6707,58 +6708,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "muda a frase secreta"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 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"
@@ -6778,15 +6789,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6816,7 +6827,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
@@ -6825,11 +6836,11 @@ msgstr "A gera
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6851,114 +6862,104 @@ msgstr "muda a frase secreta"
 msgid "|A|Please enter the Admin PIN"
 msgstr "muda a frase secreta"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "rev- revoga��es de chaves incorreta\n"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: erro lendo registro livre: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "%lu chaves processadas\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "gerar um novo par de chaves"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "enumera��o de blocos de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
@@ -7803,21 +7804,21 @@ msgstr "imposs
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7840,7 +7841,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -7942,17 +7943,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritmo de prote��o %d n�o � suportado\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "leitura de registro de assinatura falhou: %s\n"
diff --git a/po/ro.po b/po/ro.po
index f39c010ac..435fd8008 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -18,18 +18,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "am e�uat s� stochez amprenta: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -39,7 +39,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "validitate: %s"
@@ -50,45 +50,45 @@ msgstr "validitate: %s"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "linie prea lung�"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "fraz�-parol� prea lung�\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Caracter invalid �n nume\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "MPI incorect"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "fraz�-parol� incorect�"
@@ -98,22 +98,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nu pot deschide `%s': %s\n"
@@ -155,7 +155,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "schimb� fraza-parol�"
@@ -168,7 +167,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -231,13 +230,13 @@ msgstr "PIN-ul nu a fost repetat corect; mai 
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s: eroare scriere �nregistrare dir: %s\n"
@@ -310,8 +309,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -418,7 +417,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -441,142 +440,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -593,36 +592,57 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Op�iuni:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
@@ -630,21 +650,21 @@ msgid ""
 msgstr ""
 "V� rug�m introduce�i fraza-parol�; aceasta este o propozi�ie secret� \n"
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "fraz�-parol� incorect�"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "anulat�"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -680,7 +700,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -690,21 +710,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "da"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -716,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -726,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -755,43 +775,43 @@ msgstr "schimb
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eroare la ob�inerea informa�iei pentru cheia curent�: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -1186,7 +1206,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1195,7 +1215,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "p�r�i ale cheii secrete nu sunt disponibile\n"
@@ -1482,18 +1502,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nu pot deschide `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "cheia \"%s\" nu a fost g�sit�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1784,24 +1804,16 @@ msgstr "Cheia invalid
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "folosim subcheia %s �n loc de cheia primar� %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "cheia %s: cheie secret� f�r� cheie public� - s�rit�\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Comenzi:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1929,17 +1941,6 @@ msgstr "|algo [fi
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Op�iuni:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "creaz� ie�ire �n armur� ascii"
@@ -2380,7 +2381,7 @@ msgstr "cifrarea unui mesaj 
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
@@ -3097,12 +3098,12 @@ msgstr "eroare la crearea inelului de chei `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "inelul de chei `%s' creat\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "resurs� keyblock `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "am e�uat s� reconstruiesc cache-ul inelului de chei: %s\n"
@@ -3398,19 +3399,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Aceast� cheie nu este protejat�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Cheia este protejat�.\n"
 
@@ -3427,7 +3428,7 @@ msgstr ""
 "Introduce�i noua fraz�-parol� pentru acest� cheie secret�.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "fraza-parol� nu a fost repetat� corect; mai �ncerca�i o dat�"
 
@@ -4197,12 +4198,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "lungime cheie rotunjit� la %u bi�i\n"
@@ -4340,7 +4341,7 @@ msgstr "Lungimea cheii necesar
 msgid "rounded up to %u bits\n"
 msgstr "rotunjit� prin adaos la %u bi�i\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4356,7 +4357,7 @@ msgstr ""
 "      <n>m = cheia expir� �n n luni\n"
 "      <n>y = cheia expir� �n n ani\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4372,38 +4373,38 @@ msgstr ""
 "      <n>m = semn�tura expir� �n n luni\n"
 "      <n>y = semn�tura expir� �n n ani\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Cheia este valid� pentru? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Semn�tura este valid� pentru? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "valoare invalid�\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Cheia nu expir� deloc\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Semn�tura nu expir� deloc\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Cheia expir� pe %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Semn�tura expir� pe %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4411,11 +4412,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Este aceasta corect? (d/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4426,7 +4427,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4443,44 +4444,44 @@ msgstr ""
 "    \"Popa Ioan (popic�) <popa.ioan@compania.ro>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Nume real: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Caracter invalid �n nume\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Numele nu poate �ncepe cu o cifr�\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 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:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Adres� de email: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Nu este o adres� de email valid�\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Comentariu: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Caracter invalid �n comentariu\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Folosi�i setul de caractere `%s'\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4491,7 +4492,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4506,23 +4507,23 @@ msgstr "V
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoTt"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "V� rug�m corecta�i mai �nt�i eroarea\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4530,12 +4531,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a v� proteja cheia secret�.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4546,7 +4547,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:2204
+#: g10/keygen.c:2208
 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"
@@ -4558,50 +4559,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Generarea cheii a fost anulat�.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "scriu cheia public� �n `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "scriu talonul (stub) cheii secrete �n `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, 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:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei public `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei secret `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "cheile secret� �i public� au fost create �i semnate.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4611,12 +4612,12 @@ msgstr ""
 "s� folosi�i comanda \"--edit-key\" pentru a genera o subcheie secundar�\n"
 "pentru acest scop.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Generarea cheii a e�uat: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4624,7 +4625,7 @@ msgstr ""
 "cheia a fost creat� %lu secund� �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4632,25 +4633,25 @@ msgstr ""
 "cheia a fost creat� %lu secunde �n viitor (warp �n timp sau probleme cu "
 "ceasul)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Crea�i �ntr-adev�r? (d/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "stocarea cheii pe card a e�uat: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, 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:4034
+#: g10/keygen.c:4038
 #, 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"
@@ -4709,45 +4710,45 @@ msgstr "      Amprent
 msgid "      Card serial no. ="
 msgstr "      Card nr. serie ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "AVERTISMENT: exist� 2 fi�iere cu informa�ii confiden�iale.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s este cel neschimbat\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s este cel nou\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "V� rug�m repara�i aceast� deficien�� posibil� de securitate\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "pun �n cache inelul de chei `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu chei puse �n cache p�n� acum (%lu semn�turi)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu chei puse �n cache (%lu semn�turi)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: inelul de chei creat\n"
@@ -4796,7 +4797,7 @@ msgstr "deactivat(
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Introduce�i num�r/numere, N)ext (urm�tor), sau Q)uit (termin�) > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "protocol server de chei invalid (us %d!=handler %d)\n"
@@ -4810,124 +4811,124 @@ msgstr "cheia \"%s\" nu a fost g
 msgid "key not found on keyserver\n"
 msgstr "cheia nu a fost g�sit� pe serverul de chei\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "cer cheia %s de la serverul %s %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "cer cheia %s de la %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "trimit cheia %s serverului %s %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "trimit cheia %s lui %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "caut \"%s\" de pe serverul %s %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "caut \"%s\" de pe %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "nici o ac�iune pentru serverul de chei!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 "AVERTISMENT: manipulator server de chei dintr-o versiune diferit� de GnuPG (%"
 "s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "serverul de chei nu a trimis VERSION (versiune)\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "nici un server de chei cunoscut (folosi�i op�iunea --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 "apeluri c�tre server de chei extern nu este suportat de acest program\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "nici un manipulator (handler) pentru schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "ac�iunea `%s' nu este suportat� cu schema serverului de chei `%s'\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s nu suport� versiunea de manipulator (handler) %d\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "serverul de chei a epuizat timpul de a�teptare (timed out)\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "eroare intern� server de chei\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "eroare de comunicare server de chei: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" nu este un ID de cheie: s�rit\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "reactualizez 1 cheie de la %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "reactualizez %d chei de la %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "AVERTISMENT: nu pot reactualiza cheia %s via %s: %s\n"
@@ -5294,7 +5295,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (ID cheie principal� %s)"
@@ -5326,7 +5327,12 @@ msgstr "anulat
 msgid "problem with the agent: %s\n"
 msgstr "problem� cu agentul: agentul returneaz� 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nefor�at(�)"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5335,12 +5341,12 @@ msgstr ""
 "Ave�i nevoie de o fraz�-parol� pentru a descuia cheia secret� pentru\n"
 "utilizator: \"%s\"\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "cheia %u-bit %s, ID %s, creat� %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (subcheie pe cheia principal� ID %s)"
@@ -6498,11 +6504,6 @@ 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"
@@ -6533,40 +6534,40 @@ msgstr "nu pot deschide fi
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "redenumirea `%s' ca `%s' a e�uat: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "cheia public� %s nu a fost g�sit�: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "scriu cheia secret� �n `%s'\n"
@@ -6595,58 +6596,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "apelul PIN a returnat eroare: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
@@ -6666,15 +6677,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "r�spunsul nu con�ine exponentul public RSA\n"
 
@@ -6704,7 +6715,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "verificarea CHV%d a e�uat: %s\n"
@@ -6713,11 +6724,11 @@ msgstr "verificarea CHV%d a e
 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:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "cardul este �ncuiat permanent!\n"
 
@@ -6739,110 +6750,100 @@ msgstr "||V
 msgid "|A|Please enter the Admin PIN"
 msgstr "||V� rug�m introduce�i PIN%%0A[semn�turi f�cute: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, 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:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|PIN Admin Nou"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|PIN Nou"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "eroare la citirea datelor aplica�iei\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "eroare la citirea amprentei DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "cheia exist� deja\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "cheia existent� va fi �nlocuit�\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "generez o nou� cheie\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "timestamp-ul de creare lipse�te\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "modulus-ul RSA lipse�te sau nu are %d bi�i\n"
-
-#: scd/app-openpgp.c:2383
-#, fuzzy, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "exponentul public RSA lipse�te sau are mai mult de %d bi�i\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "am e�uat s� stochez cheia: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 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:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "generarea cheii a e�uat\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "generarea cheii este complet� (%d secunde)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "structur� invalid� a cardului OpenPGP (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "semn�tur� %s, algoritm rezumat %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "semn�turi create p�n� acum: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nu pot accesa %s - card OpenPGP invalid?\n"
@@ -7682,21 +7683,21 @@ msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nu pot accesa `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7719,7 +7720,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "eroare la ob�inerea num�rului serial: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -7821,17 +7822,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "algoritm de protec�ie %d%s nu este suportat\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "verificarea semn�turii create a e�uat: %s\n"
diff --git a/po/ru.po b/po/ru.po
index 28acc98b8..502ff938e 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -17,18 +17,18 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11) ? 0 : ((n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20)) ? 1 : 2);\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr ""
 
-#: agent/call-pinentry.c:596
+#: 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:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -36,7 +36,7 @@ msgstr "Введите фразу-пароль для получения дос
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr "Стойкость:"
 
@@ -46,42 +46,42 @@ msgstr "Стойкость:"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Стойкость введенного выше текста. Можете прокосультироваться у Вашего "
 "администратора о критериях оценки стойкости."
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (попытка %d из %d)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "PIN слишком длинен"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "фраза-пароль слишком длинная"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "Недопустимый символ в PIN-коде"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "PIN-код слишком короткий"
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 msgid "Bad PIN"
 msgstr "плохой PIN"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 msgid "Bad Passphrase"
 msgstr "Неверная фраза-пароль"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "Фраза-пароль"
 
@@ -90,22 +90,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "не могу открыть `%s': %s\n"
@@ -146,7 +146,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "Повторно введите фразу-пароль:"
 
@@ -160,7 +159,7 @@ msgstr ""
 "хранилища ключей gpg-agent"
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "не совпало, попробуйте еще раз"
 
@@ -219,13 +218,13 @@ msgstr "повторный PIN не совпал; попробуйте еще р
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Введите PIN%s%s%s для доступа к карте"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "ошибка создания временного файла: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "ошибка записи во временный файл: %s\n"
@@ -311,8 +310,8 @@ msgstr "Введите фразу-пароль%0Aдля защиты новог
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -412,7 +411,7 @@ msgstr "разрешить эмуляцию ssh-агента"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние окружения и в файл"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 msgid "Please report bugs to <"
@@ -435,139 +434,139 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "имя сокета `%s' слишком длинное\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -586,11 +585,32 @@ msgstr ""
 "Синтаксис: gpg-preset-passphrase [параметры] KEYGRIP\n"
 "Кеширование паролей\n"
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Параметры:\n"
+" "
+
+#: agent/protect-tool.c:162
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "Использование: gpg-protect-tool [параметры] (-h для подсказки)\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -598,21 +618,21 @@ msgstr ""
 "Синтаксис: gpg-protect-tool [параметры] [аргументы]\n"
 "Инструмент для работы с закрытыми ключами\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "Введите фразу-пароль для доступа к PKCS#12 объекту."
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "Введите фразу-пароль для защиты нового PKCS#12 объекта."
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "Введите фразу-пароль для защиты импортированных в GnuPG объектов."
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -620,19 +640,19 @@ msgstr ""
 "Введите фразу-пароль или PIN\n"
 "необходимые для выполения данной операции."
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Фраза-пароль:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "отменено\n"
+
+#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "ошибка запроса ввода фразы-пароля: %s\n"
 
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "отменено\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -668,7 +688,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "ошибка чтения `%s', строка %d: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "ошибка чтения списка доверяемых корневых сертификатов\n"
 
@@ -678,9 +698,9 @@ msgstr "ошибка чтения списка доверяемых корнев
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -689,11 +709,11 @@ msgstr ""
 "Действительно абсолютно доверять%%0A  \"%s\"%%0Aкорректно подписанным "
 "сертификатам пользователя?"
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "Да"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "Нет"
 
@@ -705,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -717,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "Подтверждаю"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -748,43 +768,43 @@ msgstr "Cменить фразу-пароль"
 msgid "I'll change it later"
 msgstr "Сменю позже"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr ""
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': статус завершения %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "ошибка запуска `%s': позможно не установлен\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
@@ -1156,7 +1176,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
 
@@ -1164,7 +1184,7 @@ msgstr "невозможно сделать это в пакетном режи
 msgid "This command is only available for version 2 cards\n"
 msgstr "Данная команда допустима только для карт версии 2\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr "Reset Code не задан или недоступен\n"
 
@@ -1450,18 +1470,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "не могу открыть `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "ключ \"%s\" не найден: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1742,24 +1762,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "использую подклключ %s вместо главного ключа %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "ключ %s: секретный ключ без открытого ключа - пропущен\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Команды:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 msgid "make a signature"
 msgstr "создать подпись"
@@ -1884,17 +1896,6 @@ msgstr "вывести хэши файлов"
 msgid "run in server mode"
 msgstr "запуск в режиме сервера"
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Параметры:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "вывод в ASCII формате"
@@ -2312,7 +2313,7 @@ msgstr "для зашифрования сообщения в режиме --pgp
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
@@ -3026,12 +3027,12 @@ msgstr "ошибка создания таблицы ключей `%s': %s\n"
 msgid "keyring `%s' created\n"
 msgstr "создана таблица ключей `%s'\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr ""
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "сбой перестройки кэша таблицы ключей: %s\n"
@@ -3322,19 +3323,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Данный ключ не защищен.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "Секретная часть главного ключа отсутствует.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "Секретная часть главного ключа сохранена на карте.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Ключ защищен.\n"
 
@@ -3351,7 +3352,7 @@ msgstr ""
 "Введите новую фразу-пароль для данного секретного ключа.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "повторный ввод фразы-пароля некорректен; попробуйте еще раз"
 
@@ -4099,12 +4100,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "размер ключа приведен к %u битам\n"
@@ -4244,7 +4245,7 @@ msgstr "Запрашиваемый размер ключа %u бит\n"
 msgid "rounded up to %u bits\n"
 msgstr "округлен до %u бит\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4260,7 +4261,7 @@ msgstr ""
 "      <n>m = срок действительности n месяцев\n"
 "      <n>y = срок действительности n лет\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4276,38 +4277,38 @@ msgstr ""
 "      <n>m = срок действительности подписи n месяцев\n"
 "      <n>y = срок действительности подписи n лет\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Ключ действителен до? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Подпись действительна до? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "недопустимое значение\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Ключ не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Подпись не имеет ограничения срока действительности\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Ключ действителен до: %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Подпись действительна до: %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4315,11 +4316,11 @@ msgstr ""
 "Ваша система не может корректно отображать даты после 2038.\n"
 "Однако, даты не превышающие 2106 будут обработаны корректно.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Все верно? (y/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4333,7 +4334,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4348,44 +4349,44 @@ msgstr ""
 "    \"Baba Yaga (pensioner) <yaga@deepforest.ru>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Ваше настоящее имя: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Недопустимый символ в Имени\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Имя не должно начинаться с цифры\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Имя не должно быть короче 5 символов\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "Email-адрес: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Неправильный e-mail адрес\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Комментарий: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Недопустимый символ в комментарии\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Используемая таблица символов: `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4396,7 +4397,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "Не вставляйте email-адрес в имя пользователя или комментарий\n"
 
@@ -4411,24 +4412,24 @@ msgstr "Не вставляйте email-адрес в имя пользоват
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr ""
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (Q)Выход? "
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr ""
 "Сменить (N)Имя, (C)Комментарий, (E)email-адрес или (O)Принять/(Q)Выход? "
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Сначала исправьте ошибку\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4436,12 +4437,12 @@ msgstr ""
 "Для защиты секретного ключа необходима фраза-пароль.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4453,7 +4454,7 @@ msgstr ""
 "запустив данную программу с ключом \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4466,50 +4467,50 @@ msgstr ""
 "обращения к дискам) в процессе генерации; это даст генератору\n"
 "случайных чисел возможность получить лучшую энтропию.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Создание ключа прервано.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "сохранение открытого ключа в `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "сохранение заглушки секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "сохранение секретного ключа в `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "нет доступной для записи таблицы открытых ключей: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "нет доступной для записи таблицы закрытых ключей: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "ошибка записи таблицы открытых ключей `%s': %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "ошибка записи таблицы секретных ключей `%s': %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "открытый и закрытый ключи созданы и подписаны.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4517,44 +4518,44 @@ msgstr ""
 "Учтите, данный ключ не может использоваться для шифрования.  Можно\n"
 "воспользоваться командой \"--edit-key\" и создать подключ для этих целей.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Сбой при создании ключа: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "ЗАМЕЧАНИЕ: создание подключа для ключей v3 не совместимо с OpenPGP\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Действительно создать? (y/N)"
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "сбой сохранения ключа на карту: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "не могу создать резервную копию, файл `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: архивная копия ключа карты сохранена в `%s'\n"
@@ -4613,45 +4614,45 @@ msgstr "Отпечаток ключа ="
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "при переименовании `%s' в `%s' произошел сбой: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "ВНИМАНИЕ: Существуют 2 файла с конфиденциальной информацией.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s осталось без изменений\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s новых\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Исправьте эту прореху безопасности\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "кеширую связки ключей `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu ключей закешировано за это время (%lu подписей)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu ключей закешированно (%lu подписей)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: таблица ключей создана\n"
@@ -4698,7 +4699,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Введите число(а), N) Следующий или Q) Выход> "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "invalid keyserver protocol (us %d!=handler %d)\n"
@@ -4712,121 +4713,121 @@ msgstr "ключ \"%s\" не найден на сервере ключей\n"
 msgid "key not found on keyserver\n"
 msgstr "ключ не найден на сервере ключей\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "запрашиваю ключ %s с %s сервера %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "получение ключа %s с %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "поиск по именам %s на сервере %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "поиск по именам на %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "отправляю ключ %s на %s сервер %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "отправка ключа %s на %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "поиск \"%s\" на %s сервере %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "поиск \"%s\" на %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr ""
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "ВНИМАНИЕ: обработчик сервера ключей от другой версии GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "сервер ключей не прислал VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "не заданы серверы ключей (используйте --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "данная сборка не поддерживает внешние вызовы для сервера ключей.\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "нет обработчика для схемы сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "действие `%s' не поддерживается схемой сервера ключей `%s'\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s не поддерживает версию обработчика %d\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "превышено время ожидания сервера ключей\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "ошибка сервера ключей\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "ошибка связи с сервером ключей: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" не идентификатор ключа: пропущен\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно обновить ключ %s с %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "обновление 1 ключа из %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "обновление %d ключей из %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "ВНИМАНИЕ: невозможно загрузить ссылку %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "ВНИМАНИЕ: невозможно проанализировать ссылку %s\n"
@@ -5194,7 +5195,7 @@ msgstr ""
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (главный ключ ID %s)"
@@ -5226,7 +5227,11 @@ msgstr "прервано пользователем\n"
 msgid "problem with the agent: %s\n"
 msgstr "проблема с агентом: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr ""
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5234,12 +5239,12 @@ msgid ""
 msgstr ""
 "Необходима фраза-пароль для доступа к секретному ключу пользователя: \"%s\"\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-бит %s ключ, ID %s, создан %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (подключ на главном ключе %s)"
@@ -6380,10 +6385,6 @@ 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"
@@ -6414,40 +6415,40 @@ msgstr ""
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "сбой преобразования `%s' в `%s': %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "невозможно создание временного файла `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "ошибка записи в `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr ""
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr ""
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr ""
@@ -6476,58 +6477,68 @@ msgstr ""
 "Синтаксис: kbxutil [параметры] [файлы]\n"
 "просморт, экспорт, импорт данных Keybox\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN всё еще не изменен\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|A|Введите Admin PIN на клавиатуре считывателя"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Введите Admin PIN на клавиатуре считывателя"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Введите Reset Code к карте"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Введите Reset Code к карте"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "ошибка при получении нового PIN: %s\n"
@@ -6547,15 +6558,15 @@ msgstr "сбой сохранения даты создания: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "сбой чтения открытого ключа: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr "ответ не содержит данных открытого ключа\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr "в ответе отсутствует модуль RSA\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "в ответе отсутствует открытая экспонента RSA\n"
 
@@ -6584,7 +6595,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "при проверке CHV%d сбой: %s\n"
@@ -6593,11 +6604,11 @@ msgstr "при проверке CHV%d сбой: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "доступ к командам управления не настроен\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr "ошибка получения статуса CHV с карты\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "карта заблокирована!\n"
 
@@ -6620,109 +6631,99 @@ msgstr ""
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Введите PIN"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Введите Reset Code к карте"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "Reset Code слишком короток, минимальная длина %d\n"
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr "|RN| Новый Reset Code"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Новый административный PIN"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Новый PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "ошибка чтения данных приложения\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "ошибка чтения отпечатка DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "ключ уже существует\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "существующий ключ будет заменен\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "генерация нового ключа\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "пропущен штамп создания создания\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "Модули RSA пропущены или не имеют размер %d бит\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "отсутствует открытая экспонента RSA или превышает %d бит\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "Простое число RSA %s пропущено или не имеет размер %d бит\n"
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "сбой сохранения ключа: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "пожалуйста, подождите, пока будет генерироваться ключ ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "сбой при генерации ключа\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "ключ сгенерирован (%d секунд)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "недопутимая структура OpenPGP карты (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "карта не поддерживает функцию хеширования %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "подписей создано: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 "проверка административного PIN в данный момент запрещена этой командой\n"
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "нет доступа %s - неработоспособная карта OpenPGP?\n"
@@ -7513,21 +7514,21 @@ msgstr ""
 msgid "WARNING: running with faked system time: "
 msgstr "ВНИМАНИЕ: выполняемся с подделанным системным временем: "
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "невозможно подписать используя `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr "данная команды всё еще не реализована\n"
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7549,7 +7550,7 @@ msgstr "ошибка базовой проверки сертификата - н
 msgid "error importing certificate: %s\n"
 msgstr "ошибка импортирования сертификата: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "ошибка чтения ввода: %s\n"
@@ -7652,17 +7653,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "хеш-функция %d (%s) для %d не поддерживается; использую %s\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr ""
diff --git a/po/sk.po b/po/sk.po
index b78323b51..3ed79de18 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -13,18 +13,18 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -33,7 +33,7 @@ msgstr "Pros
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr ""
 
@@ -43,45 +43,45 @@ msgstr ""
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "riadok je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "heslo je pr�li� dlh�\n"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "Neplatn� znak ve mene\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "nespr�vne MPI"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "nespr�vne heslo"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "nespr�vne heslo"
@@ -91,22 +91,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
@@ -147,7 +147,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "zmeni� heslo"
@@ -160,7 +159,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -223,13 +222,13 @@ msgstr "heslo nie je zopakovan
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr ""
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "zapisujem do '%s'\n"
@@ -302,8 +301,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -410,7 +409,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -435,142 +434,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, 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:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -587,55 +586,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Mo�nosti:\n"
+" "
+
+#: agent/protect-tool.c:162
 #, 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, 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:1199
+#: agent/protect-tool.c:1155
 #, 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, 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:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "nespr�vne heslo"
 
-#: agent/protect-tool.c:1220 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/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "Zru�i�"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -671,7 +691,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -681,21 +701,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "ano"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -707,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -717,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -746,43 +766,43 @@ msgstr "zmeni
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba pri z�pise do s�boru tajn�ch k���ov `%s': %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -1179,7 +1199,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
@@ -1189,7 +1209,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "tajn� �asti k���a nie s� dostupn�\n"
@@ -1501,18 +1521,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "nemo�no otvori� `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, fuzzy, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1808,24 +1828,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, fuzzy, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "pou��vam sekund�rny k��� %08lX namiesto prim�rneho k���a %08lX\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, fuzzy, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a - presko�en�\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Pr�kazy:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1954,17 +1966,6 @@ msgstr "|algo [s
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Mo�nosti:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "vytvor v�stup zak�dovan� pomocou ASCII"
@@ -2399,7 +2400,7 @@ msgstr "
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
@@ -3129,12 +3130,12 @@ msgstr "chyba pri vytv
 msgid "keyring `%s' created\n"
 msgstr "s�bor k���ov (keyring) `%s' vytvoren�\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, fuzzy, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "chyba pri vytv�ran� `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "zlyhalo obnovenie vyrovn�vacej pam�ti k���ov: %s\n"
@@ -3453,20 +3454,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Tento k��� nie je chr�nen�.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 #, 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "k��� je chr�nen�.\n"
 
@@ -3483,7 +3484,7 @@ msgstr ""
 "Vlo�te nov� heslo (passphrase) pre tento tajn� k���.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "heslo nie je zopakovan� spr�vne; sk�ste to znovu"
 
@@ -4282,12 +4283,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "d�ka k���a zaokr�hlen� na %u bitov\n"
@@ -4427,7 +4428,7 @@ msgstr "Po
 msgid "rounded up to %u bits\n"
 msgstr "zaokr�hlen� na %u bitov\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4443,7 +4444,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:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4459,40 +4460,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:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "K��� je platn� na? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, fuzzy, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Podpis je platn� na? (0) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "neplatn� hodnota\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 #, fuzzy
 msgid "Key does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 #, fuzzy
 msgid "Signature does not expire at all\n"
 msgstr "platnos� %s neskon��\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, fuzzy, c-format
 msgid "Key expires at %s\n"
 msgstr "platnos� %s skon�� %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, fuzzy, c-format
 msgid "Signature expires at %s\n"
 msgstr "Platnos� podpisu vypr�� %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4500,12 +4501,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:1937
+#: g10/keygen.c:1941
 #, fuzzy
 msgid "Is this correct? (y/N) "
 msgstr "Je to spr�vne (a/n)? "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4516,7 +4517,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:1982
+#: g10/keygen.c:1986
 #, fuzzy
 msgid ""
 "\n"
@@ -4533,44 +4534,44 @@ msgstr ""
 "    \"Jozko Mrkvicka (student) <jozko@mrkvicka.sk>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Meno a priezvisko: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Neplatn� znak ve mene\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Meno nem��e za��na� ��slicou\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Meno mus� by� dlh� aspo� 5 znakov\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "E-mailov� adresa: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "Neplatn� e-mailov� adresa\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Koment�r: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Neplatn� znak v koment�ri\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Pou��vate znakov� sadu `%s'.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4581,7 +4582,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4596,23 +4597,23 @@ msgstr "Do po
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "mMkKeEPpUu"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Najsk�r, pros�m, opravte chybu\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4620,12 +4621,12 @@ msgstr ""
 "Na ochranu V�ho tajn�ho k���a mus�te zada� heslo.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4637,7 +4638,7 @@ msgstr ""
 "tohto programu s parametrom \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4649,50 +4650,50 @@ msgstr ""
 "pou��va� disky); v�aka tomu m� gener�tor lep�iu �ancu z�ska� dostatok "
 "entropie.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Vytv�ranie k���a bolo zru�en�.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "zapisujem verejn� k��� do `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, fuzzy, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, 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:3466
+#: g10/keygen.c:3470
 #, 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:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, 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:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "verejn� a tajn� k��� boli vytvoren� a podp�san�.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 #, fuzzy
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
@@ -4701,12 +4702,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4714,7 +4715,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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4722,26 +4723,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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 #, fuzzy
 msgid "Really create? (y/N) "
 msgstr "Skuto�ne vytvori�? "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, fuzzy, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, fuzzy, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "nem��em vytvori� `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, 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"
@@ -4801,45 +4802,45 @@ msgstr "   Fingerprint k
 msgid "      Card serial no. ="
 msgstr ""
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, fuzzy, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VAROVANIE: Existuj� dva s�bory s tajn�mi inform�ciami.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s je bez zmeny\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s je nov�\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Pros�m, opravte tento mo�n� bezpe�nostn� probl�m\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, fuzzy, c-format
 msgid "caching keyring `%s'\n"
 msgstr "kontrolujem s�bor k���ov (keyring) `%s'\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, fuzzy, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, fuzzy, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu k���ov skontrolovan�ch (%lu podpisov)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: s�bor k���ov (keyring) vytvoren�\n"
@@ -4887,7 +4888,7 @@ msgstr "disable"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr ""
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, fuzzy, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "neplatn� parameter pre export\n"
@@ -4902,126 +4903,126 @@ msgstr "k
 msgid "key not found on keyserver\n"
 msgstr "k��� `%s' nebol n�jden�: %s\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, fuzzy, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, fuzzy, c-format
 msgid "requesting key %s from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, fuzzy, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, fuzzy, c-format
 msgid "searching for names from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, fuzzy, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, fuzzy, c-format
 msgid "sending key %s to %s\n"
 msgstr ""
 "\"\n"
 "podp�san� Va��m k���om %08lX v %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, fuzzy, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "vyh�ad�vam \"%s\" na HKP serveri %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 #, fuzzy
 msgid "no keyserver action!\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr ""
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr ""
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr ""
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr ""
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr ""
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr ""
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 #, fuzzy
 msgid "keyserver timed out\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 #, fuzzy
 msgid "keyserver internal error\n"
 msgstr "chyba servera k���ov"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, fuzzy, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr ""
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, fuzzy, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, fuzzy, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, fuzzy, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "po�adujem k��� %08lX z %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, fuzzy, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, fuzzy, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VAROVANIE: nem��em vymaza� do�asn� s�bor (%s) `%s': %s\n"
@@ -5395,7 +5396,7 @@ msgstr ""
 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:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, fuzzy, c-format
 msgid " (main key ID %s)"
 msgstr " (hlavn� ID k���a %08lX)"
@@ -5426,7 +5427,12 @@ msgstr "zru
 msgid "problem with the agent: %s\n"
 msgstr "probl�m s agentom: agent vracia 0x%lx\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "nespracovan�"
+
+#: g10/passphrase.c:567
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5436,12 +5442,12 @@ msgstr ""
 "Mus�te pozna� heslo, aby ste odomkli tajn� k��� pre\n"
 "u��vate�a: \""
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr ""
@@ -6613,11 +6619,6 @@ 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"
@@ -6648,40 +6649,40 @@ msgstr "nemo
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "verejn� k��� %08lX nebol n�jden�: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
@@ -6712,58 +6713,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, c-format
+msgid "RSA modulus missing or not of size %d bits\n"
+msgstr ""
+
+#: scd/app-nks.c:720 scd/app-openpgp.c:2385
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr ""
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "zmeni� heslo"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "zmeni� heslo"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Pros�m v�berte d�vod na revok�ciu:\n"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, fuzzy, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
@@ -6783,15 +6794,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr ""
 
@@ -6821,7 +6832,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, fuzzy, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
@@ -6830,11 +6841,11 @@ msgstr "nepodarilo posla
 msgid "access to admin commands is not configured\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr ""
 
@@ -6856,114 +6867,104 @@ msgstr "zmeni
 msgid "|A|Please enter the Admin PIN"
 msgstr "zmeni� heslo"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, 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:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr ""
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr ""
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 #, fuzzy
 msgid "error reading application data\n"
 msgstr "chyba pri ��tan� bloku k���a: %s\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 #, fuzzy
 msgid "error reading fingerprint DO\n"
 msgstr "%s: chyba pri ��tan� vo�n�ho z�znamu: %s\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 #, fuzzy
 msgid "key already exists\n"
 msgstr "`%s' je u� skomprimovan�\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 #, fuzzy
 msgid "generating new key\n"
 msgstr "vytvori� nov� p�r k���ov"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr ""
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, 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:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 #, fuzzy
 msgid "generating key failed\n"
 msgstr "zmazanie bloku k���a sa nepodarilo:  %s\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, fuzzy, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "Vytvorenie k���a sa nepodarilo: %s\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, fuzzy, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr ""
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, fuzzy, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
@@ -7801,21 +7802,21 @@ msgstr "nemo
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, fuzzy, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "nem��em zavrie� `%s': %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7838,7 +7839,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -7940,17 +7941,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "ochrann� algoritmus %d%s nie je podporov�n�\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "kontrola vytvoren�ho podpisu sa nepodarila: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 77314c329..8e2129c3c 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -33,12 +33,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "misslyckades med att ta kontroll över PIN-inmatningslåset: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -46,7 +46,7 @@ msgstr ""
 "Ange din PIN-kod så att den hemliga nyckeln kan låsas upp för den här "
 "sessionen"
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -55,7 +55,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr "Kvalitet:"
 
@@ -65,7 +65,7 @@ msgstr "Kvalitet:"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "Denna rad indikerar kvaliteten för ovan angiven lösenfras.\n"
@@ -74,37 +74,37 @@ msgstr ""
 "och specialtecken. Fråga din administratör om mer exakt information hur\n"
 "man anger säkra lösenfraser."
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (försök %d av %d)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "PIN-koden är för lång"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "Lösenfrasen är för lång"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "Ogiltiga tecken i PIN-kod"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "PIN-kod för kort"
 
 # MPI står för Multiple Precision Integer (tror jag)
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 msgid "Bad PIN"
 msgstr "Felaktig PIN-kod"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 msgid "Bad Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "Lösenfras"
 
@@ -115,22 +115,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "kan inte öppna \"%s\": %s\n"
@@ -171,7 +171,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "Ange denna lösenfras igen"
 
@@ -185,7 +184,7 @@ msgstr ""
 "gpg-agents nyckellager"
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "stämmer inte överens - försök igen"
 
@@ -246,13 +245,13 @@ msgstr "PIN-kod repeterades inte korrekt; försök igen"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "fel när temporärfil skapades: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "fel vid skrivning till temporärfil: %s\n"
@@ -334,8 +333,8 @@ 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 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -436,7 +435,7 @@ msgstr "aktivera ssh-agent-emulering"
 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:146
+#: 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
 msgid "Please report bugs to <"
@@ -459,140 +458,140 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, 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:1473
+#: agent/gpg-agent.c:1476
 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, 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:1749
+#: agent/gpg-agent.c:1752
 #, 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:1769
+#: agent/gpg-agent.c:1772
 #, 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:1774
+#: agent/gpg-agent.c:1777
 #, 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:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 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:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -612,11 +611,33 @@ msgstr ""
 "Syntax: gpg-preset-passphrase [flaggor] NYCKELHASH\n"
 "Underhåll av lösenordscache\n"
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+msgstr ""
+"@Kommandon:\n"
+" "
+
+# 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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Flaggor:\n"
+" "
+
+#: agent/protect-tool.c:162
 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -624,22 +645,22 @@ msgstr ""
 "Syntax: gpg-protect-tool [flaggor] [argument]\n"
 "Underhållsverktyg för hemliga nycklar\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 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:1199
+#: agent/protect-tool.c:1155
 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:1202
+#: agent/protect-tool.c:1161
 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:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -647,19 +668,19 @@ msgstr ""
 "Ange lösenfrasen eller PIN-koden som\n"
 "behövs för att färdigställa denna åtgärd."
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Lösenfras:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "avbruten\n"
+
+#: agent/protect-tool.c:1178 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/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "avbruten\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -695,7 +716,7 @@ msgstr "ogiltig nyckelflagga i \"%s\", rad %d\n"
 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:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 
@@ -705,9 +726,9 @@ msgstr "fel vid inläsning av betrodda rotcertifikat\n"
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -716,11 +737,11 @@ msgstr ""
 "Litar du förbehållslöst på%%0A  \"%s\"%%0Aatt korrekt certifiera "
 "användarcertifikat?"
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "Ja"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "Nej"
 
@@ -732,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -744,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "Korrekt"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -776,44 +797,44 @@ msgstr "ändra lösenfras"
 msgid "I'll change it later"
 msgstr "Jag ändrar den senare"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "fel när ett rör skapades: %s\n"
 
 # se förra kommentaren
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan inte fdopen rör för läsning: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fel vid hämtning av avslutskod för processen %d: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
@@ -1191,7 +1212,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1200,7 +1221,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "de hemliga nyckeldelarna är inte tillgängliga\n"
@@ -1490,18 +1511,18 @@ msgid "--output doesn't work for this command\n"
 msgstr "--output kan inte användas för detta kommando\n"
 
 # se förra kommentaren
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "kan inte öppna \"%s\"\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "nyckeln \"%s\" hittades inte: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1788,24 +1809,16 @@ msgstr ""
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "använder undernyckeln %s istället för primära nyckeln %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "nyckel %s: hemlig nyckel utan publik nyckel - hoppades över\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Kommandon:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1934,18 +1947,6 @@ msgstr "|algo [filer]|skriv ut kontrollsummor"
 msgid "run in server mode"
 msgstr "kör i serverläge"
 
-# Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: g10/gpg.c:436 g10/gpgv.c:69 kbx/kbxutil.c:81 sm/gpgsm.c:226
-#: tools/gpg-connect-agent.c:67 tools/gpgconf.c:76 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Flaggor:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "skapa utdata med ett ascii-skal"
@@ -2374,7 +2375,7 @@ msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
@@ -3108,12 +3109,12 @@ msgstr "fel när nyckelringen \"%s\" skapades: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "%s: nyckelring skapad\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "nyckelblockresurs \"%s\": %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "misslyckades med att återskapa nyckelringscache: %s\n"
@@ -3408,19 +3409,19 @@ msgstr ""
 "Nyckeln har endast en stump eller nyckelobjekt på kortet - ingen lösenfras "
 "att ändra.\n"
 
-#: g10/keyedit.c:1142 g10/keygen.c:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Denna nyckel är inte skyddad.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Nyckeln är skyddad.\n"
 
@@ -3437,7 +3438,7 @@ msgstr ""
 "Skriv in den nya lösenfrasen för den hemliga nyckeln.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "lösenfrasen repeterades inte korrekt; försök igen."
 
@@ -4208,12 +4209,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "nyckelstorleken avrundad uppåt till %u bitar\n"
@@ -4358,7 +4359,7 @@ 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:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4375,7 +4376,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:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4391,38 +4392,38 @@ msgstr ""
 "      <n>m = signaturen blir ogiltig efter n månader\n"
 "      <n>y = signaturen blir ogiltig efter n år\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "För hur lång tid ska nyckeln vara giltig? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "Signaturen är giltig hur länge? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "ogiltigt värde\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Nyckeln går aldrig ut\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "Signaturen går aldrig ut\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Nyckeln går ut %s\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "Signaturen går ut %s\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4430,11 +4431,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Stämmer detta? (j/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4449,7 +4450,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4467,44 +4468,44 @@ msgstr ""
 "    \"Gustav Vasa (Brutal kung) <gustav@trekronor.se>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Namn: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Ogiltigt tecken i namnet\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Namnet får inte börja med en siffra\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "Namnet måste vara åtminstone 5 tecken långt\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "E-postadress: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "E-postadressen är ogiltig\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Kommentar: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Ogiltigt tecken i kommentaren\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "Du använder teckentabellen \"%s\"\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4515,7 +4516,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
 
@@ -4531,24 +4532,24 @@ msgstr "Ange inte e-postadressen som namn eller kommentar\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnKkEeOoAa"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Rätta först felet\n"
 
 # fel kapitalisering i originalet?
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4556,12 +4557,12 @@ msgstr ""
 "Du behöver en lösenfras för att skydda din hemliga nyckel\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4573,7 +4574,7 @@ msgstr ""
 "om du använder detta program med flaggan \"--edit-key\".\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4585,51 +4586,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:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Skapandet av nycklar avbröts.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "skriver den publika nyckeln till \"%s\"\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "skriver hemliga nyckelstumpen till \"%s\"\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "skriver hemlig nyckel till \"%s\"\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "ingen skrivbar publik nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "ingen skrivbar hemlig nyckelring hittades: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "fel vid skrivning av publika nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "fel vid skrivning av hemliga nyckelringen \"%s\": %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 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:3532
+#: g10/keygen.c:3536
 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"
@@ -4638,13 +4639,13 @@ msgstr ""
 "vill använda flaggan \"--edit-key\" för att skapa en undernyckel för detta "
 "syfte.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Nyckelgenereringen misslyckades: %s\n"
 
 # c-format behövs inte i singularis
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 g10/sign.c:241
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
@@ -4652,7 +4653,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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4660,25 +4661,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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Verkligen skapa? (j/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "misslyckades med att lagra nyckeln på kortet: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "kan inte skapa säkerhetskopian \"%s\": %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "OBSERVERA: säkerhetskopia av kortnyckeln sparades i \"%s\"\n"
@@ -4737,46 +4738,46 @@ msgstr "Nyckelns fingeravtryck ="
 msgid "      Card serial no. ="
 msgstr "       Kortets serienr ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "namnbyte från \"%s\" till \"%s\" misslyckades: %s\n"
 
 # Enligt Werner uppstår detta om något går snett när den hemliga nyckeln uppdateras.
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "VARNING: det finns 2 filer med konfidentiell information.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s är den oförändrade\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s är den nya\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Lös detta potentiella säkerhetsproblem\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "mellanlagrar nyckelringen \"%s\"\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade än så länge (%lu signaturer)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu nycklar mellanlagrade (%lu signaturer)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: nyckelring skapad\n"
@@ -4824,7 +4825,7 @@ msgstr "inaktiverad"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Ange nummer, N)ästa, eller Q) för Avsluta > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "ogiltigt nyckelserverprotokoll (vi %d!=hanterare %d)\n"
@@ -4838,121 +4839,121 @@ msgstr "nyckeln \"%s\" hittades inte på nyckelservern\n"
 msgid "key not found on keyserver\n"
 msgstr "nyckeln hittades inte på nyckelservern\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "begär nyckeln %s från %s-servern %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "begär nyckeln %s från %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "söker efter namn från %s-servern %s\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "söker efter namn från %s\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "skickar nyckeln %s till %s-servern %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "skickar nyckeln %s till %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "söker efter \"%s\" från %s-servern %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "söker efter \"%s\" från %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "ingen nyckelserveråtgärd!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "VARNING: nyckelserverhanteraren från en annan version av GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "nyckelserver skickade inte VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "ingen nyckelserver är känd (använd flaggan --keyserver)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "externa anrop till nyckelserver stöds inte i detta bygge\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "ingen hanterare för nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "åtgärden \"%s\" stöds inte med nyckelserverschemat \"%s\"\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s har inte stöd för hanterarversionen %d\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "tidsgräns överstigen för nyckelserver\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "internt fel i nyckelserver\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "kommunikationsfel mot nyckelserver: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" inte ett nyckel-id: hoppar över\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "VARNING: kunde inte uppdatera nyckeln %s via %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "uppdaterar 1 nyckel från %s\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "uppdaterar %d nycklar från %s\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "VARNING: kunde inte hämta uri:n %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "VARNING: kunde inte tolka uri:n %s\n"
@@ -5324,7 +5325,7 @@ msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 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:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (primära nyckelns id %s)"
@@ -5357,7 +5358,12 @@ msgstr "avbruten av användaren\n"
 msgid "problem with the agent: %s\n"
 msgstr "problem med agenten: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "[Fel - slut på kärna]"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5366,12 +5372,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:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u-bitars %s-nyckel, id %s, skapad %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (undernyckel på primärt nyckel-id %s)"
@@ -6559,11 +6565,6 @@ 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"
@@ -6594,40 +6595,40 @@ msgstr "iconv_open misslyckades: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "konvertering från \"%s\" till \"%s\" misslyckades: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "misslyckades med att skapa temporärfilen \"%s\": %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "fel vid skrivning till \"%s\": %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "tar bort gammal låsfil (skapad av %d)\n"
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr " - antagligen död - tar bort lås"
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "väntar på lås (hålls av %d%s) %s...\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr "(dödläge?) "
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "låset \"%s\" gjordes inte: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "väntar på låset %s...\n"
@@ -6656,58 +6657,68 @@ msgstr ""
 "Syntax: kbxutil [flaggor] [filer]\n"
 "lista, exportera, importera nyckelskåpsdata\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN-återanrop returnerade fel: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN har ännu inte ändrats\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Knappa in din PIN-kod på läsarens knappsats"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Ange administratörens PIN-kod på läsarens knappsats"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "Ange PIN-koden%s%s%s för att låsa upp kortet"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 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"
@@ -6727,15 +6738,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "svaret innehåller inte den publika RSA-exponenten\n"
 
@@ -6767,7 +6778,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "validering av CHV%d misslyckades: %s\n"
@@ -6776,11 +6787,11 @@ msgstr "validering av CHV%d misslyckades: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "åtkomst till administrationskommandon är inte konfigurerat\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "kortet är låst permanent!\n"
 
@@ -6804,111 +6815,101 @@ msgstr ""
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Ange PIN-koden%%0A[signaturer kvar: %lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, 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:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|Ny Admin PIN-kod"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Ny PIN-kod"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "fel vid läsning av programdata\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "fel vid läsning av fingeravtryckets DO\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "nyckeln finns redan\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "befintlig nyckel kommer att ersättas\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "genererar ny nyckel\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "tidsstämpel för skapandet saknas\n"
 
-#: scd/app-openpgp.c:2371
-#, 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-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "Publik RSA-exponent saknas eller större än %d bitar\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "misslyckades med att lagra nyckeln: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "var god vänta under tiden nyckeln genereras ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "nyckelgenereringen misslyckades\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "nyckelgenereringen är färdig (%d sekunder)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "ogiltig struktur för OpenPGP-kort (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 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:2794
+#: scd/app-openpgp.c:2824
 #, 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:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "signaturer skapade hittills: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "kan inte komma åt %s - ogiltigt OpenPGP-kort?\n"
@@ -7706,21 +7707,21 @@ msgstr "kunde inte tolka nyckelserver\n"
 msgid "WARNING: running with faked system time: "
 msgstr "VARNING: kör med falsk systemtid: "
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "importerar vanliga certifikat \"%s\"\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "kan inte signera med \"%s\": %s\n"
 
-#: sm/gpgsm.c:1717
+#: 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:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr "ogiltigt kommando (det finns inget implicit kommando)\n"
 
@@ -7742,7 +7743,7 @@ msgstr "enkla certifikatkontroller misslyckades - importeras inte\n"
 msgid "error importing certificate: %s\n"
 msgstr "fel vid import av certifikat: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "fel vid läsning av indata: %s\n"
@@ -7855,17 +7856,17 @@ msgstr ""
 "Observera att det här certifikatet INTE kommer att skapa en kvalificerad "
 "signatur!"
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "hashalgoritm %d (%s) för signerare %d stöds inte; använder %s\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "hashalgoritm som används för signerare %d: %s (%s)\n"
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "sökande efter kvalificerat certifikat misslyckades: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 70feb66eb..6e71a1fc7 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -17,12 +17,12 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "PIN giriş kilidi edinilemedi: %s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
@@ -30,7 +30,7 @@ msgstr ""
 "Lütfen PIN'inizi giriniz, böylelikle bu oturumda bu gizli anahtar kilitsiz "
 "olabilecek"
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -40,7 +40,7 @@ msgstr ""
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr "Kalite:"
 
@@ -50,40 +50,40 @@ msgstr "Kalite:"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (%d/%d dene)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "PIN çok uzun"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "Anahtar Parolası çok uzun"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "PIN içinde geçersiz karakterler var"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "PIN çok kısa"
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 msgid "Bad PIN"
 msgstr "PIN hatalı"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 msgid "Bad Passphrase"
 msgstr "Anahtar Parolası hatalı"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "Anahtar Parolası"
 
@@ -92,22 +92,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
@@ -148,7 +148,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "Lütfen bu anahtar parolasını tekrar girin"
 
@@ -162,7 +161,7 @@ msgstr ""
 "için lütfen anahtar parolası giriniz"
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "aynı değiller - tekrar deneyin"
 
@@ -221,13 +220,13 @@ msgstr "PIN doğru tekrarlanmadı; tekrar deneyin"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "Kartın kilidini açmak için lütfen PIN%s%s%s giriniz"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "geçici dosya oluşturulurken hata: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "geçeci dosyaya yazma hatası: %s\n"
@@ -307,8 +306,8 @@ 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 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -408,7 +407,7 @@ msgstr "ssh-agent öykünümü etkinleşir"
 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:146
+#: 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
 msgid "Please report bugs to <"
@@ -431,139 +430,139 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, 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:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "soketin ismi `%s' çok uzun\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 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:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 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:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 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:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, 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:1592
+#: agent/gpg-agent.c:1595
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, 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:1749
+#: agent/gpg-agent.c:1752
 #, 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:1769
+#: agent/gpg-agent.c:1772
 #, 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:1774
+#: agent/gpg-agent.c:1777
 #, 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:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 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:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -582,11 +581,32 @@ msgstr ""
 "Sözdizimi: gpg-preset-passphrase [seçenekler] ANHMAŞASI\n"
 "Parola arabelleği bakımcısı\n"
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"Seçenekler:\n"
+" "
+
+#: agent/protect-tool.c:162
 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:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -594,16 +614,16 @@ msgstr ""
 "Sözdizimi: gpg-protect-tool [seçenekler] [arg ...]\n"
 "Gizli anahtar bakım aracı\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 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:1199
+#: agent/protect-tool.c:1155
 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:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
@@ -611,7 +631,7 @@ msgstr ""
 "Lütfen GnuPG sistemine ithal edilen nesneyi koruyacak anahtar parolasını "
 "giriniz."
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -619,19 +639,19 @@ msgstr ""
 "Lütfen bu işlemi tamamlamak için gereken\n"
 "PIN'i veya anahtar parolasını giriniz."
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "Anahtar Parolası:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "iptal edildi\n"
+
+#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "anahtar parolası sorulurken hata: %s\n"
 
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "iptal edildi\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -667,7 +687,7 @@ msgstr "`%s', %d. satırda anahtar bayrağı geçersiz\n"
 msgid "error reading `%s', line %d: %s\n"
 msgstr "`%s' okunurken %d. satırda hata: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 
@@ -677,9 +697,9 @@ msgstr "güvenilir kök sertifika listesinin okunmasında hata\n"
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
@@ -688,11 +708,11 @@ msgstr ""
 "Kullanıcı sertifikalarının%%0A  \"%s\"%%0Aile doğru olarak onaylanacağından "
 "son derece emin misiniz?"
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "Evet"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "Hayır"
 
@@ -704,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -716,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "Doğru"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -747,43 +767,43 @@ msgstr "Anahtar parolasını değiştir"
 msgid "I'll change it later"
 msgstr "Sonra değiştireceğim"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "boru oluşturulurken hata: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "okumak için boruya fdopen yapılamadı: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "süreç %d çıkış kodu alınırken hata: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
@@ -1155,7 +1175,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 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"
 
@@ -1163,7 +1183,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr "Sıfırlama kodu ya yok ya da kullanım dışı\n"
 
@@ -1449,18 +1469,18 @@ msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output seçeneği bu komutla çalışmaz\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "`%s' açılamadı\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "anahtar \"%s\" yok: %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1746,24 +1766,16 @@ msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
 "yardımcı genel anahtar %s için gizli yardımcı anahtar yok - yoksayılıyor\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "yardımcı anahtar %s, asıl anahtar %s yerine kullanılıyor\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "anahtar %s: genel anahtarsız gizli anahtar - atlandı\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@Komutlar:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 msgid "make a signature"
 msgstr "bir imza yapar"
@@ -1888,17 +1900,6 @@ msgstr "ileti özetlerini gösterir"
 msgid "run in server mode"
 msgstr "sunucu kipinde çalışır"
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"Seçenekler:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "ascii zırhlı çıktı oluşturur"
@@ -2318,7 +2319,7 @@ msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 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:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
@@ -3039,12 +3040,12 @@ msgstr "`%s' anahtarlığı oluşturulurken hata: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' anahtarlığı oluşturuldu\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "anahtar bloku özkaynağı `%s': %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "anahtar zinciri önbelleği yeniden oluşturulurken hata: %s\n"
@@ -3342,19 +3343,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "Bu anahtar korunmamış.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 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:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 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:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "Anahtar korunmuş.\n"
 
@@ -3371,7 +3372,7 @@ msgstr ""
 "Bu gizli anahtar için yeni anahtar parolasını giriniz.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr ""
 "ikinci kez yazdığınız anahtar parolası ilkiyle aynı değil; işlem "
@@ -4167,12 +4168,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "anahtar uzunluğu %u bite yuvarlandı\n"
@@ -4312,7 +4313,7 @@ msgstr "İstenen anahtar uzunluğu: %u bit\n"
 msgid "rounded up to %u bits\n"
 msgstr "%u bite yuvarlandı\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4328,7 +4329,7 @@ msgstr ""
 "      <n>m = anahtar n ay geçerli\n"
 "      <n>y = anahtar n yıl geçerli\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4344,38 +4345,38 @@ msgstr ""
 "      <n>m = imza n ay geçerli\n"
 "      <n>y = imza n yıl geçerli\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "Anahtar ne kadar geçerli olacak? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "İmza ne kadar geçerli olacak? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "değer hatalı\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "Anahtar hep geçerli olacak\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "İmza hep geçerli olacak\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "Anahtarın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "İmzanın geçerliliği %s de bitecek.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4383,11 +4384,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:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "Bu doğru mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4402,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4418,44 +4419,44 @@ msgstr ""
 "\t\"Fatih Sultan Mehmed (Padisah) <padisah@ottoman.gov>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "Adınız ve Soyadınız: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "Ad ve soyadınızda geçersiz karakter var\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "Ad ve soyadınız bir rakamla başlamamalı\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 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:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "E-posta adresiniz: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "geçerli bir E-posta adresi değil\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "Önbilgi: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "Önbilgi alanında geçersiz karakter var\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "`%s' karakter kümesini kullanıyorsunuz.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4466,7 +4467,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 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"
@@ -4482,24 +4483,24 @@ msgstr ""
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "AaYyEeTtKk"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 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:2101
+#: g10/keygen.c:2105
 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:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "Lütfen önce hatayı düzeltin\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4507,12 +4508,12 @@ msgstr ""
 "Gizli anahtarınızı korumak için bir Anahtar Parolanız olmalı.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4524,7 +4525,7 @@ msgstr ""
 "seçeneği ile kullanarak her zaman değiştirebilirsiniz.\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -4537,50 +4538,50 @@ msgstr ""
 "iyi olacaktır; bu yeterli rasgele bayt kazanmak için rasgele sayı\n"
 "üretecine yardımcı olur. \n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "Anahtar üretimi durduruldu.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "genel anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "gizli anahtar koçanı `%s'e yazılıyor\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "gizli anahtarı `%s'e yazıyor\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "yazılabilir bir genel anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "yazılabilir bir gizli anahtar zinciri yok: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, 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:3494
+#: g10/keygen.c:3498
 #, 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:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "genel ve gizli anahtar üretildi ve imzalandı.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4588,19 +4589,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:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "Anahtar üretimi başarısızlığa uğradı: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 g10/sign.c:243
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
@@ -4608,26 +4609,26 @@ msgstr ""
 "anahtar bundan %lu saniye sonra üretilmiş (zaman sapması veya saat "
 "problemi)\n"
 
-#: g10/keygen.c:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 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:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "Gerçekten oluşturulsun mu? (e/H ya da y/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, 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:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "'%s' yedek dosyası oluşturulamıyor: %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "BİLGİ: kart anahtarının yedeklemesi '%s' e kaydedildi\n"
@@ -4686,45 +4687,45 @@ msgstr "     Anahtar parmakizi ="
 msgid "      Card serial no. ="
 msgstr "      Kart seri no. ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' isim değişikliği başarısız: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "UYARI: gizli bilgi içeren 2 dosya mevcut.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s değişmeyenlerden\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s yenilerden\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "Lütfen bu güvenlik çatlağını giderin\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "`%s' anahtar zinciri önbellekleniyor\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "şimdiye kadar %lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "%lu anahtar arabelleklendi (%lu imza)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: anahtar zinciri oluşturuldu\n"
@@ -4772,7 +4773,7 @@ msgstr "iptal edildi"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "Sayıyı/sayıları girin veya S)onraki ya da Ç)ık >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "anahtar sunucu protokolü geçersiz (bizimki %d!=eylemci %d)\n"
@@ -4786,121 +4787,121 @@ msgstr "anahtar \"%s\" anahtar sunucusunda yok\n"
 msgid "key not found on keyserver\n"
 msgstr "anahtar, anahtar sunucusunda yok\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "%1$s anahtarı %3$s sunucusunun %2$s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "%s anahtarı %s adresinden isteniyor\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "%2$s sunucusunda %1$s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "%s içindeki isimler aranıyor\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "anahtar %1$s, %3$s sunucusunun %2$s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "%s anahtarı %s adresine gönderiliyor\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "%3$s sunucusunun %2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "%2$s adresinde \"%1$s\" aranıyor\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "bir anahtar sunucusu eylemi yok!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "UYARI: GnuPG'nin başka bir sürümünün anahtar sunucusu eylemcisi (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "anahtar sunucusu VERSION göndermiyor\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "bilinen bir anahtar sunucusu yok (--keyserver seçeneğini kullanın)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "harici anahtar sunucusu çağrıları bu kurulumda desteklenmiyor\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "`%s' anahtar sunucusu şeması için eylemci yok\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' eylemi `%s' anahtar sunucusu şeması ile desteklenmiyor\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s  %d sürümü eylemciyi desteklemiyor\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "anahtar sunucusu zamanaşımına uğradı\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "anahtar sunucusu iç hatası\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "anahtar sunucusuyla iletişim hatası: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" bir anahtar kimliği değil: atlanıyor\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "UYARI: %s anahtarı %s üzerinden tazelenemiyor: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d anahtar %s adresinden tazeleniyor\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "UYARI: Betimleyici %s alınamıyor: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "UYARI: Betimleyici %s çözümlenemiyor\n"
@@ -5264,7 +5265,7 @@ msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (asıl anahtar kimliği %s)"
@@ -5296,7 +5297,11 @@ msgstr "kullanıcı tarafından durduruldu\n"
 msgid "problem with the agent: %s\n"
 msgstr "aracı ile sorun var: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "nüve dışında\n"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5305,12 +5310,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:574
+#: g10/passphrase.c:575
 #, 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:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (asıl anahtar kimliği %s üzerinde yardımcı anahtar)"
@@ -6465,10 +6470,6 @@ 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"
@@ -6499,40 +6500,40 @@ msgstr "iconv_open başarısız: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "`%s' > `%s' dönüşümü başarısız: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "`%s' geçici dosyası oluşturulamıyor: %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "`%s' yazılırken hata: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "bayat kilit dosyası siliniyor (%d tarafından oluşturulmuş)\n"
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr " - muhtemelen ölü - kilit siliniyor"
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "kilit için bekleniyor (%d%s tarafından tutulmuş) %s...\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr "(ölükilit?) "
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "kilit `%s' yapılmadı: %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "%s kilidi için bekleniyor...\n"
@@ -6561,58 +6562,68 @@ msgstr ""
 "Sözdizimi: kbxutil [seçenekler] [dosyalar]\n"
 "Anahtar kutusu verisini listeler, ithal ve ihraç eder\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN eylemcisi hata döndürdü: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "BoşPIN henüz değişmedi\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||Lütfen PIN'inizi okuyucunun tuştakımından giriniz"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|Lütfen Yönetici PIN'ini okuyucu tuştakımından giriniz"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "yeni PIN alınırken hata: %s\n"
@@ -6632,15 +6643,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:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 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:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 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:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "yanıt RSA genel bileşenini içermiyor\n"
 
@@ -6671,7 +6682,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
@@ -6680,11 +6691,11 @@ msgstr "CHV%d doğrulaması başarısız oldu: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "yönetici komutlarına erişim yapılandırılmamış\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 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:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "kart kalıcı olarak kilitli!\n"
 
@@ -6709,108 +6720,98 @@ msgstr ""
 msgid "|A|Please enter the Admin PIN"
 msgstr "||Lütfen PIN'i giriniz"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 msgid "||Please enter the Reset Code for the card"
 msgstr "||Lütfen kart için Sıfırlama Kodunu giriniz"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, 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:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr "|YSK|Yeni Sıfırlama Kodu"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|YYP|Yeni Yönetici PIN'i"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|Yeni PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "uygulama verisi okunurken hata\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "parmakizi DO okunurken hata\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "anahtar zaten mevcut\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "mevcut anahtar konulacak\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "yeni anahtar üretiliyor\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "oluşturum zaman damgası kayıp\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA modülü ya eksik ya da %d bitlik değil\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA genel üstel sayısı ya eksik ya da %d bitten büyük\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, 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:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "anahtarın saklanması başarısız: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "anahtar üretilene kadar lütfen bekleyiniz ....\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "anahtar üretimi başarısızlığa uğradı\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "anahtar üretimi tamamlandı (%d saniye)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 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:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr "karttaki parmak izi istenenle eşleşmiyor\n"
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "kart %s özet algoritmasını desteklemiyor\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "şu ana kadar oluşturulan imzalar: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 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:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "%s erişilebilir değil - OpenPGP kartı geçersiz olabilir mi?\n"
@@ -7605,21 +7606,21 @@ msgstr "anahtar sunucusu çözümlenemedi\n"
 msgid "WARNING: running with faked system time: "
 msgstr "UYARI: sahte sistem zamanıyla çalışıyor: "
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "ortak sertifikalar `%s' ithal ediliyor\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "`%s' kullanarak imzalanamıyor: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr "bu komut henüz gerçeklenmedi\n"
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr "geçersiz komut (hiç dolaylı komut yok)\n"
 
@@ -7641,7 +7642,7 @@ msgstr "temel sertifika sınamaları başarısız oldu - ithal edilmedi\n"
 msgid "error importing certificate: %s\n"
 msgstr "sertifika ithal edilirken hata: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "girdi okunurken hata: %s\n"
@@ -7751,18 +7752,18 @@ msgstr ""
 "\"%s\"\n"
 "Bu sertifkanın nitelikli bir imza üretmeyeceğine dikkat ediniz!"
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr ""
 "çittirim algoritması %d (%s) imzacı %d için desteklenmiyor; %s kullanılıyor\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "%d imzacı için kullanılan çittirim algoritması: %s (%s)\n"
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "nitelikli sertifika için sınama başarısız: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9ef10c501..444ea961e 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -19,18 +19,18 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, fuzzy, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "无法存储指纹：%s\n"
 
-#: agent/call-pinentry.c:596
+#: agent/call-pinentry.c:597
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr ""
 
-#: agent/call-pinentry.c:599
+#: agent/call-pinentry.c:600
 #, fuzzy
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
@@ -39,7 +39,7 @@ msgstr "请输入密码：这是一个秘密的句子 \n"
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 #, fuzzy
 msgid "Quality:"
 msgstr "有效性：%s"
@@ -50,45 +50,45 @@ msgstr "有效性：%s"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr ""
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 #, fuzzy
 msgid "PIN too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 #, fuzzy
 msgid "Passphrase too long"
 msgstr "列太长"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 #, fuzzy
 msgid "Invalid characters in PIN"
 msgstr "姓名含有无效的字符\n"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr ""
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 #, fuzzy
 msgid "Bad PIN"
 msgstr "损坏的多精度整数(MPI)"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 #, fuzzy
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 #, fuzzy
 msgid "Passphrase"
 msgstr "错误的密码"
@@ -98,22 +98,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "无法打开‘%s’： %s\n"
@@ -154,7 +154,6 @@ 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/protect-tool.c:1205
 #, fuzzy
 msgid "Please re-enter this passphrase"
 msgstr "更改密码"
@@ -167,7 +166,7 @@ msgid ""
 msgstr ""
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr ""
 
@@ -230,13 +229,13 @@ msgstr "PIN 再次输入时与首次输入不符；请再试一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, fuzzy, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, fuzzy, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "%s：写入目录记录时出错：%s\n"
@@ -309,8 +308,8 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
 "@Options:\n"
@@ -417,7 +416,7 @@ msgstr ""
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 #, fuzzy
@@ -442,142 +441,142 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 scd/scdaemon.c:1081
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/gpg-agent.c:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -594,55 +593,76 @@ msgid ""
 "Password cache maintenance\n"
 msgstr ""
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"选项：\n"
+" "
+
+#: agent/protect-tool.c:162
 #, fuzzy
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
 msgstr ""
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 #, fuzzy
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 #, fuzzy
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr ""
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 #, fuzzy
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
 msgstr "请输入密码：这是一个秘密的句子 \n"
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 #, fuzzy
 msgid "Passphrase:"
 msgstr "错误的密码"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
-#, fuzzy, c-format
-msgid "error while asking for the passphrase: %s\n"
-msgstr "生成密码的时候发生错误：%s\n"
-
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
 #, fuzzy
 msgid "cancelled\n"
 msgstr "已取消"
 
+#: agent/protect-tool.c:1178 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
 #, fuzzy, c-format
 msgid "error opening `%s': %s\n"
@@ -678,7 +698,7 @@ msgstr ""
 msgid "error reading `%s', line %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr ""
 
@@ -688,21 +708,21 @@ msgstr ""
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr ""
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 #, fuzzy
 msgid "Yes"
 msgstr "yes"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr ""
 
@@ -714,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -724,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr ""
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -753,43 +773,43 @@ msgstr "更改密码"
 msgid "I'll change it later"
 msgstr ""
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, fuzzy, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, fuzzy, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr ""
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, fuzzy, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -1179,7 +1199,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
@@ -1188,7 +1208,7 @@ 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:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 #, fuzzy
 msgid "Reset Code not or not anymore available\n"
 msgstr "私钥部分不可用\n"
@@ -1475,18 +1495,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "无法打开‘%s’\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "密钥‘%s’找不到：%s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1761,24 +1781,16 @@ msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子钥 %s 而非主钥 %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "密钥 %s：无相应公钥的私钥――已跳过\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@指令：\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 #, fuzzy
 msgid "make a signature"
@@ -1906,17 +1918,6 @@ msgstr "|算法 [文件]|使用指定的散列算法打印报文散列值"
 msgid "run in server mode"
 msgstr ""
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"选项：\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "输出经 ASCII 封装"
@@ -2330,7 +2331,7 @@ msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
@@ -3038,12 +3039,12 @@ msgstr "建立钥匙环‘%s’时发生错误：%s\n"
 msgid "keyring `%s' created\n"
 msgstr "钥匙环‘%s’已建立\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "密钥块资源‘%s’：%s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
@@ -3325,19 +3326,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "这把密钥没有被保护。\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主钥的私钥部分无法取用。\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主钥的私钥部分存储在卡上。\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "密钥受保护。\n"
 
@@ -3354,7 +3355,7 @@ msgstr ""
 "输入要给这把私钥用的新密码。\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "密码再次输入时与首次输入不符；请再试一次"
 
@@ -4102,12 +4103,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
@@ -4245,7 +4246,7 @@ msgstr "您所要求的密钥尺寸是 %u 位\n"
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4261,7 +4262,7 @@ msgstr ""
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4277,38 +4278,38 @@ msgstr ""
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是多久？(%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "无效的数值\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4316,11 +4317,11 @@ msgstr ""
 "您的系统无法显示 2038 年以后的日期。\n"
 "不过，它可以正确处理 2106 年之前的年份。\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "以上正确吗？(y/n)"
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4331,7 +4332,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4347,44 +4348,44 @@ msgstr ""
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "真实姓名："
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "电子邮件地址："
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "注释："
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4395,7 +4396,7 @@ msgstr ""
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 
@@ -4410,23 +4411,23 @@ msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或退出(Q)？"
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名(N)、注释(C)、电子邮件地址(E)或确定(O)/退出(Q)？"
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4434,12 +4435,12 @@ msgstr ""
 "您需要一个密码来保护您的私钥。\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4451,7 +4452,7 @@ msgstr ""
 "再次执行这个程序，并且使用“--edit-key”选项即可。\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4461,50 +4462,50 @@ msgstr ""
 "我们需要生成大量的随机字节。这个时候您可以多做些琐事(像是敲打键盘、移动\n"
 "鼠标、读写硬盘之类的)，这会让随机数字发生器有更好的机会获得足够的熵数。\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在将公钥写至`%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "向‘%s’写入私钥占位符\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可写的私钥钥匙环：%s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "写入私钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并经签名。\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4512,42 +4513,42 @@ msgstr ""
 "请注意这把密钥还不能用来加密，您必须先用“--edit-key”指令\n"
 "生成用于加密的子钥。\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "生成密钥失败：%s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥生成子钥会失去 OpenPGP 兼容性\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "真的要建立吗？(y/N)"
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "向卡上存储密钥时失败：%s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "注意：卡密钥的备份已保存到‘%s’\n"
@@ -4607,45 +4608,45 @@ msgstr "密钥指纹 ="
 msgid "      Card serial no. ="
 msgstr "卡序列号 ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告：两个文件存在有互相矛盾的信息。\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是没有改变的那一个\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一个\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "请修补这个可能的安全性漏洞\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已缓存 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "缓存了 %lu 把密钥(%lu 份签名)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已建立\n"
@@ -4691,7 +4692,7 @@ msgstr "已禁用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "输入数字以选择，输入 N 翻页，输入 Q 退出 >"
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "无效的公钥服务器协议(us %d!=handler %d)\n"
@@ -4705,121 +4706,121 @@ msgstr "在公钥服务器上找不到密钥“%s”\n"
 msgid "key not found on keyserver\n"
 msgstr "在公钥服务器上找不到密钥\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "下载密钥‘%s’，从 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "下载密钥 %s，从 %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "在 %s 服务器 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "在 %s 上搜索名字\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "将密钥‘%s’上传到 %s 服务器 %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "将密钥‘%s’上传到 %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "搜索“%s”，在 %s 服务器 %s 上\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "搜索“%s”，在 %s 上\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "公钥服务器无动作！\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告：处理公钥服务器的程序来自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "公钥服务器未发送 VERSION\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "未给出公钥服务器(使用 --keyserver 选项)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "这一编译版本不支持外部调用公钥服务器\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "没有处理‘%s’公钥服务器的程序\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "‘%s’操作不为‘%s’公钥服务器所支持\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 不支持对版本 %d 的处理\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "公钥服务器超时\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "公钥服务器内部错误\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "公钥服务器通讯错误：%s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "“%s”不是一个用户标识：跳过\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告：无法更新密钥 %s，通过 %s：%s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "1 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "%d 个密钥正从 %s 得到更新\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "不能解析 URI %s\n"
@@ -5179,7 +5180,7 @@ msgstr "警告：潜在不安全的对称加密会话密钥\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主钥匙号 %s)"
@@ -5210,19 +5211,24 @@ msgstr "用户取消\n"
 msgid "problem with the agent: %s\n"
 msgstr "代理程序有问题――正在停用代理程序\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+#, fuzzy
+msgid "out of core\n"
+msgstr "可选"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
 "user: \"%s\"\n"
 msgstr "您需要输入密码，才能解开这个用户的私钥：“%s”\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位的 %s 密钥，钥匙号 %s，建立于 %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (主钥 %s 的子钥)"
@@ -6337,11 +6343,6 @@ 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"
@@ -6372,40 +6373,40 @@ msgstr "签名时失败： %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "将‘%s’重命名为‘%s’时失败：%s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, fuzzy, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, fuzzy, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr ""
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr ""
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, fuzzy, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "等待‘%s’上的锁\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr ""
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, fuzzy, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "找不到公钥 %s：%s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, fuzzy, c-format
 msgid "waiting for lock %s...\n"
 msgstr "等待‘%s’上的锁\n"
@@ -6436,58 +6437,68 @@ msgid ""
 "list, export, import Keybox data\n"
 msgstr ""
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr ""
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出错：%s\n"
@@ -6507,15 +6518,15 @@ msgstr "无法存储创建日期：%s\n"
 msgid "reading public key failed: %s\n"
 msgstr "无法读出公钥：%s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr "响应未包含公钥数据\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应未包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应未包含 RSA 公钥指数\n"
 
@@ -6545,7 +6556,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
@@ -6554,11 +6565,11 @@ msgstr "验证 CHV%d 失败：%s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "尚未配置管理员命令的权限\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡中获取 CHV 状态时出错\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "卡被永久锁定！\n"
 
@@ -6580,109 +6591,99 @@ msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 msgid "|A|Please enter the Admin PIN"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 #, fuzzy
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入 PIN%%0A[完成的签字：%lu]"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, fuzzy, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr ""
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "新的 PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 D0 出错\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 余数缺失或者不是 %d 位长\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公钥指数缺失或长于 %d 位\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "无法存储密钥：%s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "请稍候，正在生成密钥……\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "密钥已生成(耗时 %d 秒)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构(D0 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr ""
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡不支持散列算法 %s\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能存取 %s――无效的 OpenPGP 卡？\n"
@@ -7516,21 +7517,21 @@ msgstr "无法解析公钥服务器 URL\n"
 msgid "WARNING: running with faked system time: "
 msgstr ""
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr ""
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, fuzzy, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "无法存取‘%s’：%s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr ""
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr ""
 
@@ -7553,7 +7554,7 @@ msgstr ""
 msgid "error importing certificate: %s\n"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, fuzzy, c-format
 msgid "error reading input: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -7655,17 +7656,17 @@ msgid ""
 "Note, that this certificate will NOT create a qualified signature!"
 msgstr ""
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, fuzzy, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "保护算法 %d%s 未被支持\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr ""
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, fuzzy, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "检查已建立的签名时发生错误： %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f02fc1674..f4ea1b24c 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-03-24 18:56+0100\n"
+"POT-Creation-Date: 2009-05-13 18:04+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"
@@ -21,18 +21,18 @@ msgstr ""
 "X-Poedit-Country: TAIWAN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: agent/call-pinentry.c:225
+#: agent/call-pinentry.c:226
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "個人識別碼項目鎖定獲取失敗: %s\n"
 
-#: agent/call-pinentry.c:596
+#: 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:599
+#: agent/call-pinentry.c:600
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
@@ -40,7 +40,7 @@ msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
 #. TRANSLATORS: This string is displayed by pinentry as the
 #. label for the quality bar.
-#: agent/call-pinentry.c:634
+#: agent/call-pinentry.c:635
 msgid "Quality:"
 msgstr "品質: %s"
 
@@ -50,42 +50,42 @@ msgstr "品質: %s"
 #. 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:657
+#: agent/call-pinentry.c:658
 msgid "pinentry.qualitybar.tooltip"
 msgstr ""
 "輸入在上面的文字的品質.\n"
 "關於此規範的細節, 請洽你的系統管理者."
 
-#: agent/call-pinentry.c:699
+#: agent/call-pinentry.c:700
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "設定錯誤 %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:719 agent/call-pinentry.c:731
+#: agent/call-pinentry.c:720 agent/call-pinentry.c:732
 msgid "PIN too long"
 msgstr "PIN 太長"
 
-#: agent/call-pinentry.c:720
+#: agent/call-pinentry.c:721
 msgid "Passphrase too long"
 msgstr "密語太長"
 
-#: agent/call-pinentry.c:728
+#: agent/call-pinentry.c:729
 msgid "Invalid characters in PIN"
 msgstr "PIN 含有無效的字符"
 
-#: agent/call-pinentry.c:733
+#: agent/call-pinentry.c:734
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:745
+#: agent/call-pinentry.c:746
 msgid "Bad PIN"
 msgstr "不良的 PIN"
 
-#: agent/call-pinentry.c:746
+#: agent/call-pinentry.c:747
 msgid "Bad Passphrase"
 msgstr "不良的密語"
 
-#: agent/call-pinentry.c:782
+#: agent/call-pinentry.c:783
 msgid "Passphrase"
 msgstr "密語"
 
@@ -94,22 +94,22 @@ 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:3258
-#: g10/keygen.c:3291 g10/keyring.c:1206 g10/keyring.c:1510 g10/openfile.c:275
+#: 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
 #: g10/openfile.c:368 g10/sign.c:798 g10/sign.c:1107 g10/tdbio.c:547
-#: jnlib/dotlock.c:311
+#: 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
 #: 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:2743
-#: g10/keyring.c:1536 g10/openfile.c:192 g10/openfile.c:353
+#: g10/encode.c:504 g10/gpg.c:1080 g10/import.c:193 g10/keygen.c:2747
+#: 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:1981
-#: sm/gpgsm.c:2018 sm/gpgsm.c:2056 sm/qualified.c:66
+#: 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
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
@@ -150,7 +150,6 @@ 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/protect-tool.c:1205
 msgid "Please re-enter this passphrase"
 msgstr "請再次輸入密語"
 
@@ -162,7 +161,7 @@ msgid ""
 msgstr "請輸入密語以保護收到的私鑰%%0A   %s%%0A於 gpg-agent 的金鑰存放處"
 
 #: agent/command-ssh.c:2405 agent/genkey.c:340 agent/genkey.c:463
-#: agent/protect-tool.c:1211 tools/symcryptrun.c:434
+#: tools/symcryptrun.c:434
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
 
@@ -221,13 +220,13 @@ msgstr "前後兩次輸入的 PIN 不一致; 請再試一次"
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "請輸入 PIN%s%s%s 以解開卡片"
 
-#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:632 sm/export.c:648
-#: sm/import.c:531 sm/import.c:556
+#: agent/genkey.c:108 sm/certreqgen-ui.c:284 sm/export.c:638 sm/export.c:654
+#: sm/import.c:537 sm/import.c:562
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "建立暫存檔時出錯: %s\n"
 
-#: agent/genkey.c:115 sm/export.c:639 sm/import.c:539
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:545
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "寫入暫存檔時出錯: %s\n"
@@ -298,8 +297,8 @@ msgstr "請輸入密語至%0A以保護你的新金鑰"
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 agent/protect-tool.c:109
-#: scd/scdaemon.c:102 tools/gpg-check-pattern.c:70
+#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:102
+#: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
 " "
@@ -399,7 +398,7 @@ msgstr "啟用 ssh-agent 模擬"
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
-#: agent/gpg-agent.c:328 agent/preset-passphrase.c:94 agent/protect-tool.c:146
+#: 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
 msgid "Please report bugs to <"
@@ -422,139 +421,139 @@ msgstr ""
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
-#: agent/gpg-agent.c:582 agent/protect-tool.c:1074 kbx/kbxutil.c:429
+#: 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
 #: 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:681 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
+#: agent/gpg-agent.c:682 g10/gpg.c:2086 scd/scdaemon.c:480 sm/gpgsm.c:971
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:686 agent/gpg-agent.c:1294 g10/gpg.c:2090
+#: 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
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:694 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
+#: agent/gpg-agent.c:695 g10/gpg.c:2097 scd/scdaemon.c:493 sm/gpgsm.c:982
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:1044 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1046 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:1407 agent/gpg-agent.c:1527 agent/gpg-agent.c:1531
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1576 g10/exec.c:172
+#: 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
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1421 scd/scdaemon.c:1003
+#: agent/gpg-agent.c:1424 scd/scdaemon.c:1003
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1444 scd/scdaemon.c:1026
+#: agent/gpg-agent.c:1447 scd/scdaemon.c:1026
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:1453
+#: agent/gpg-agent.c:1456
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "socket 名稱 `%s' 太長\n"
 
-#: agent/gpg-agent.c:1473
+#: agent/gpg-agent.c:1476
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1484 scd/scdaemon.c:1046
+#: agent/gpg-agent.c:1487 scd/scdaemon.c:1046
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1489 scd/scdaemon.c:1049
+#: agent/gpg-agent.c:1492 scd/scdaemon.c:1049
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1501 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1504 scd/scdaemon.c:1058
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1507 scd/scdaemon.c:1065
+#: agent/gpg-agent.c:1510 scd/scdaemon.c:1065
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
 
-#: agent/gpg-agent.c:1535 agent/gpg-agent.c:1582 g10/openfile.c:432
+#: agent/gpg-agent.c:1538 agent/gpg-agent.c:1585 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "`%s' 目錄已建立\n"
 
-#: agent/gpg-agent.c:1588
+#: agent/gpg-agent.c:1591
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() 失敗於 `%s': %s\n"
 
-#: agent/gpg-agent.c:1592
+#: agent/gpg-agent.c:1595
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1722 scd/scdaemon.c:1081
+#: agent/gpg-agent.c:1725 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:1744
+#: agent/gpg-agent.c:1747
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1749
+#: agent/gpg-agent.c:1752
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1769
+#: agent/gpg-agent.c:1772
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1774
+#: agent/gpg-agent.c:1777
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1914 scd/scdaemon.c:1218
+#: agent/gpg-agent.c:1917 scd/scdaemon.c:1218
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:2023 scd/scdaemon.c:1285
+#: agent/gpg-agent.c:2026 scd/scdaemon.c:1285
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:2151
+#: agent/gpg-agent.c:2154
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/gpg-agent.c:2162 common/simple-pwquery.c:349 common/asshelp.c:326
+#: agent/gpg-agent.c:2165 common/simple-pwquery.c:349 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:2175 common/simple-pwquery.c:361 common/asshelp.c:338
+#: agent/gpg-agent.c:2178 common/simple-pwquery.c:361 common/asshelp.c:338
 #: tools/gpg-connect-agent.c:2144
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -572,11 +571,32 @@ msgstr ""
 "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:149
+#: agent/protect-tool.c:111 g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185
+#: tools/gpgconf.c:59
+msgid ""
+"@Commands:\n"
+" "
+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
+#: tools/symcryptrun.c:157
+msgid ""
+"@\n"
+"Options:\n"
+" "
+msgstr ""
+"@\n"
+"選項:\n"
+" "
+
+#: agent/protect-tool.c:162
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法: gpg-protect-tool [選項] (或用 -h 求助)\n"
 
-#: agent/protect-tool.c:151
+#: agent/protect-tool.c:164
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -584,21 +604,21 @@ msgstr ""
 "語法: gpg-protect-tool [選項] [引數]\n"
 "私鑰維護工具\n"
 
-#: agent/protect-tool.c:1196
+#: agent/protect-tool.c:1150
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "請輸入密語來取消 PKCS#12 物件的保護."
 
-#: agent/protect-tool.c:1199
+#: agent/protect-tool.c:1155
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語來保護新的 PKCS#12 物件."
 
-#: agent/protect-tool.c:1202
+#: agent/protect-tool.c:1161
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
-#: agent/protect-tool.c:1207
+#: agent/protect-tool.c:1166
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -606,19 +626,19 @@ msgstr ""
 "請輸入完成這項操作所需的\n"
 "密語或 PIN."
 
-#: agent/protect-tool.c:1212 tools/symcryptrun.c:435
+#: agent/protect-tool.c:1171 tools/symcryptrun.c:435
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/protect-tool.c:1220 tools/symcryptrun.c:442
+#: agent/protect-tool.c:1176 tools/symcryptrun.c:446
+msgid "cancelled\n"
+msgstr "已取消\n"
+
+#: agent/protect-tool.c:1178 tools/symcryptrun.c:442
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢問密語時出錯: %s\n"
 
-#: agent/protect-tool.c:1223 tools/symcryptrun.c:446
-msgid "cancelled\n"
-msgstr "已取消\n"
-
 #: agent/trustlist.c:135 agent/trustlist.c:333
 #, c-format
 msgid "error opening `%s': %s\n"
@@ -654,7 +674,7 @@ msgstr "無效的金鑰旗標於 `%s', 第 %d 列\n"
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:398 agent/trustlist.c:451
+#: agent/trustlist.c:398 agent/trustlist.c:448
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀取已信任根憑證清單時出錯\n"
 
@@ -664,20 +684,20 @@ msgstr "讀取已信任根憑證清單時出錯\n"
 #. percent sign is actually needed because it is also
 #. a printf format string.  If you need to insert a
 #. plain % sign, you need to encode it as "%%25".  The
-#. "%s" gets replaced by the name as store in the
+#. "%s" gets replaced by the name as stored in the
 #. certificate.
-#: agent/trustlist.c:572
+#: agent/trustlist.c:609
 #, c-format
 msgid ""
 "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
 "certificates?"
 msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:578 common/audit.c:467
+#: agent/trustlist.c:618 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:578 common/audit.c:469
+#: agent/trustlist.c:618 common/audit.c:469
 msgid "No"
 msgstr "No"
 
@@ -689,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:606
+#: agent/trustlist.c:652
 #, c-format
 msgid ""
 "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
@@ -699,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:619
+#: agent/trustlist.c:666
 msgid "Correct"
 msgstr "正確"
 
-#: agent/trustlist.c:619
+#: agent/trustlist.c:666
 msgid "Wrong"
 msgstr ""
 
@@ -727,43 +747,43 @@ msgstr "更改密語"
 msgid "I'll change it later"
 msgstr "我稍後再變更"
 
-#: common/exechelp.c:523 common/exechelp.c:614 tools/gpgconf-comp.c:1475
+#: common/exechelp.c:528 common/exechelp.c:625 tools/gpgconf-comp.c:1475
 #: tools/gpgconf-comp.c:1814
 #, c-format
 msgid "error creating a pipe: %s\n"
 msgstr "建立管道時出錯: %s\n"
 
-#: common/exechelp.c:588 common/exechelp.c:647
+#: common/exechelp.c:599 common/exechelp.c:658
 #, c-format
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "無法將管道打開流以讀取: %s\n"
 
-#: common/exechelp.c:626 common/exechelp.c:754 common/exechelp.c:989
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "衍生執行程序時出錯: %s\n"
 
-#: common/exechelp.c:800 common/exechelp.c:853
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等候 %d 處理程序終止時失敗: %s\n"
 
-#: common/exechelp.c:808
+#: common/exechelp.c:819
 #, c-format
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
 
-#: common/exechelp.c:814 common/exechelp.c:864
+#: common/exechelp.c:825 common/exechelp.c:875
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "執行 `%s' 時出錯: 結束狀態 %d\n"
 
-#: common/exechelp.c:859
+#: common/exechelp.c:870
 #, c-format
 msgid "error running `%s': probably not installed\n"
 msgstr "執行 `%s' 時出錯: 可能尚未安裝\n"
 
-#: common/exechelp.c:872
+#: common/exechelp.c:883
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "執行 `%s' 時出錯: 已終止\n"
@@ -1131,7 +1151,7 @@ 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:2934 g10/revoke.c:216 g10/revoke.c:455
+#: g10/keygen.c:2938 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -1139,7 +1159,7 @@ msgstr "無法在批次模式中這樣做\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版卡片纔能用這個指令\n"
 
-#: g10/card-util.c:85 scd/app-openpgp.c:1875
+#: g10/card-util.c:85 scd/app-openpgp.c:1877
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
@@ -1425,18 +1445,18 @@ 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:380 g10/keyring.c:667
+#: g10/decrypt.c:166 g10/gpg.c:3969 g10/keyring.c:387 g10/keyring.c:698
 #, c-format
 msgid "can't open `%s'\n"
 msgstr "無法開啟 `%s'\n"
 
-#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1729
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3435 g10/keyserver.c:1731
 #: g10/revoke.c:226
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "找不到金鑰 \"%s\": %s\n"
 
-#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1743
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2417 g10/keyserver.c:1745
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1710,24 +1730,16 @@ msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
 
-#: g10/getkey.c:2769
+#: g10/getkey.c:2759
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 
-#: g10/getkey.c:2816
+#: g10/getkey.c:2806
 #, c-format
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:370 kbx/kbxutil.c:71 sm/gpgsm.c:185 tools/gpgconf.c:59
-msgid ""
-"@Commands:\n"
-" "
-msgstr ""
-"@指令:\n"
-" "
-
 #: g10/gpg.c:372 sm/gpgsm.c:187
 msgid "make a signature"
 msgstr "建立簽章"
@@ -1852,17 +1864,6 @@ msgstr "印出訊息摘要"
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: 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 tools/symcryptrun.c:157
-msgid ""
-"@\n"
-"Options:\n"
-" "
-msgstr ""
-"@\n"
-"選項:\n"
-" "
-
 #: g10/gpg.c:438 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
@@ -2270,7 +2271,7 @@ msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1469 sm/gpgsm.c:1475
+#: g10/gpg.c:3126 g10/gpg.c:3150 sm/gpgsm.c:1467 sm/gpgsm.c:1473
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
@@ -2977,12 +2978,12 @@ msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' 鑰匙圈已建立\n"
 
-#: g10/keydb.c:328 g10/keydb.c:331
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' 金鑰區塊資源: %s\n"
 
-#: g10/keydb.c:712
+#: g10/keydb.c:719
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立鑰匙圈快取失敗: %s\n"
@@ -3268,19 +3269,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:3633
+#: g10/keyedit.c:1142 g10/keygen.c:3637
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1146 g10/keygen.c:3620 g10/revoke.c:538
+#: g10/keyedit.c:1146 g10/keygen.c:3624 g10/revoke.c:538
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1150 g10/keygen.c:3636
+#: g10/keyedit.c:1150 g10/keygen.c:3640
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1156 g10/keygen.c:3640
+#: g10/keyedit.c:1156 g10/keygen.c:3644
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3297,7 +3298,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1207 g10/keygen.c:2173
+#: g10/keyedit.c:1207 g10/keygen.c:2177
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -4047,12 +4048,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:3133
+#: g10/keygen.c:3137
 #, 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:3139
+#: g10/keygen.c:1164 g10/keygen.c:1280 g10/keygen.c:1415 g10/keygen.c:3143
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
@@ -4190,7 +4191,7 @@ msgstr "你所要求的金鑰尺寸是 %u 位元\n"
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/keygen.c:1849
+#: g10/keygen.c:1853
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4206,7 +4207,7 @@ msgstr ""
 "      <n>m = 金鑰在 n 月後會到期\n"
 "      <n>y = 金鑰在 n 年後會到期\n"
 
-#: g10/keygen.c:1860
+#: g10/keygen.c:1864
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4222,38 +4223,38 @@ msgstr ""
 "      <n>m = 簽章在 n 月後會到期\n"
 "      <n>y = 簽章在 n 年後會到期\n"
 
-#: g10/keygen.c:1883
+#: g10/keygen.c:1887
 msgid "Key is valid for? (0) "
 msgstr "金鑰的有效期限是多久? (0) "
 
-#: g10/keygen.c:1888
+#: g10/keygen.c:1892
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1906 g10/keygen.c:1931
+#: g10/keygen.c:1910 g10/keygen.c:1935
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
-#: g10/keygen.c:1913
+#: g10/keygen.c:1917
 msgid "Key does not expire at all\n"
 msgstr "金鑰完全不會過期\n"
 
-#: g10/keygen.c:1914
+#: g10/keygen.c:1918
 msgid "Signature does not expire at all\n"
 msgstr "簽章完全不會過期\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1923
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "金鑰將會在 %s 到期\n"
 
-#: g10/keygen.c:1920
+#: g10/keygen.c:1924
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "簽章將會在 %s 到期.\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1928
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4261,11 +4262,11 @@ msgstr ""
 "你的系統無法顯示 2038 年以後的日期.\n"
 "不過, 它可以正確處理直到 2106 年之前的年份.\n"
 
-#: g10/keygen.c:1937
+#: g10/keygen.c:1941
 msgid "Is this correct? (y/N) "
 msgstr "以上正確嗎? (y/N) "
 
-#: g10/keygen.c:1967
+#: g10/keygen.c:1971
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4279,7 +4280,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:1982
+#: g10/keygen.c:1986
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4294,44 +4295,44 @@ msgstr ""
 "    \"Ke-Huan Lin (Jedi) <Jedi@Jedi.org>\"\n"
 "\n"
 
-#: g10/keygen.c:2001
+#: g10/keygen.c:2005
 msgid "Real name: "
 msgstr "真實姓名: "
 
-#: g10/keygen.c:2009
+#: g10/keygen.c:2013
 msgid "Invalid character in name\n"
 msgstr "姓名含有無效的字符\n"
 
-#: g10/keygen.c:2011
+#: g10/keygen.c:2015
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用數字開頭\n"
 
-#: g10/keygen.c:2013
+#: g10/keygen.c:2017
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五個字符長\n"
 
-#: g10/keygen.c:2021
+#: g10/keygen.c:2025
 msgid "Email address: "
 msgstr "電子郵件地址: "
 
-#: g10/keygen.c:2027
+#: g10/keygen.c:2031
 msgid "Not a valid email address\n"
 msgstr "不是有效的電子郵件地址\n"
 
-#: g10/keygen.c:2035
+#: g10/keygen.c:2039
 msgid "Comment: "
 msgstr "註釋: "
 
-#: g10/keygen.c:2041
+#: g10/keygen.c:2045
 msgid "Invalid character in comment\n"
 msgstr "註釋含有無效的字符\n"
 
-#: g10/keygen.c:2063
+#: g10/keygen.c:2067
 #, c-format
 msgid "You are using the `%s' character set.\n"
 msgstr "你正在使用 `%s' 字元集.\n"
 
-#: g10/keygen.c:2069
+#: g10/keygen.c:2073
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -4342,7 +4343,7 @@ msgstr ""
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:2074
+#: g10/keygen.c:2078
 msgid "Please don't put the email address into the real name or the comment\n"
 msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 
@@ -4357,23 +4358,23 @@ msgstr "請不要把電子郵件地址放進你的真實姓名或註釋裡\n"
 #. o = Okay (ready, continue)
 #. q = Quit
 #.
-#: g10/keygen.c:2090
+#: g10/keygen.c:2094
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2100
+#: g10/keygen.c:2104
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或退出(Q)? "
 
-#: g10/keygen.c:2101
+#: g10/keygen.c:2105
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "變更姓名(N), 註釋(C), 電子郵件地址(E)或確定(O)/退出(Q)? "
 
-#: g10/keygen.c:2120
+#: g10/keygen.c:2124
 msgid "Please correct the error first\n"
 msgstr "請先訂正錯誤\n"
 
-#: g10/keygen.c:2159
+#: g10/keygen.c:2163
 msgid ""
 "You need a Passphrase to protect your secret key.\n"
 "\n"
@@ -4381,12 +4382,12 @@ msgstr ""
 "你需要一個密語來保護你的私鑰.\n"
 "\n"
 
-#: g10/keygen.c:2174
+#: g10/keygen.c:2178
 #, c-format
 msgid "%s.\n"
 msgstr "%s.\n"
 
-#: g10/keygen.c:2180
+#: g10/keygen.c:2184
 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"
@@ -4398,7 +4399,7 @@ msgstr ""
 "僅需要再次執行這個程式, 並且使用 \"--edit-key\" 選項即可.\n"
 "\n"
 
-#: g10/keygen.c:2204
+#: g10/keygen.c:2208
 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"
@@ -4409,50 +4410,50 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:3073 g10/keygen.c:3100
+#: g10/keygen.c:3077 g10/keygen.c:3104
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:3305 g10/keygen.c:3472
+#: g10/keygen.c:3309 g10/keygen.c:3476
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:3307 g10/keygen.c:3475
+#: g10/keygen.c:3311 g10/keygen.c:3479
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3310 g10/keygen.c:3478
+#: g10/keygen.c:3314 g10/keygen.c:3482
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
 
-#: g10/keygen.c:3459
+#: g10/keygen.c:3463
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "找不到可寫入的公鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3466
+#: g10/keygen.c:3470
 #, c-format
 msgid "no writable secret keyring found: %s\n"
 msgstr "找不到可寫入的私鑰鑰匙圈: %s\n"
 
-#: g10/keygen.c:3486
+#: g10/keygen.c:3490
 #, c-format
 msgid "error writing public keyring `%s': %s\n"
 msgstr "寫入公鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3494
+#: g10/keygen.c:3498
 #, c-format
 msgid "error writing secret keyring `%s': %s\n"
 msgstr "寫入私鑰鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/keygen.c:3521
+#: g10/keygen.c:3525
 msgid "public and secret key created and signed.\n"
 msgstr "公鑰和私鑰已建立及簽署.\n"
 
-#: g10/keygen.c:3532
+#: g10/keygen.c:3536
 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"
@@ -4460,42 +4461,42 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3545 g10/keygen.c:3690 g10/keygen.c:3811
+#: g10/keygen.c:3549 g10/keygen.c:3694 g10/keygen.c:3815
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3600 g10/keygen.c:3741 g10/sign.c:241
+#: g10/keygen.c:3604 g10/keygen.c:3745 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:3602 g10/keygen.c:3743 g10/sign.c:243
+#: g10/keygen.c:3606 g10/keygen.c:3747 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:3613 g10/keygen.c:3754
+#: g10/keygen.c:3617 g10/keygen.c:3758
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3654 g10/keygen.c:3787
+#: g10/keygen.c:3658 g10/keygen.c:3791
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
-#: g10/keygen.c:3960
+#: g10/keygen.c:3964
 #, c-format
 msgid "storing key onto card failed: %s\n"
 msgstr "儲存金鑰到卡片上時失敗: %s\n"
 
-#: g10/keygen.c:4008
+#: g10/keygen.c:4012
 #, c-format
 msgid "can't create backup file `%s': %s\n"
 msgstr "無法建立備份檔案 `%s': %s\n"
 
-#: g10/keygen.c:4034
+#: g10/keygen.c:4038
 #, c-format
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
@@ -4555,45 +4556,45 @@ msgstr "      金鑰指紋 ="
 msgid "      Card serial no. ="
 msgstr "      卡片序號 ="
 
-#: g10/keyring.c:1253
+#: g10/keyring.c:1297
 #, c-format
 msgid "renaming `%s' to `%s' failed: %s\n"
 msgstr "把 `%s' 重新新命成 `%s' 時失敗: %s\n"
 
-#: g10/keyring.c:1258
+#: g10/keyring.c:1326
 msgid "WARNING: 2 files with confidential information exists.\n"
 msgstr "警告: 2 個檔案存在有互相矛盾的資訊.\n"
 
-#: g10/keyring.c:1260
+#: g10/keyring.c:1327
 #, c-format
 msgid "%s is the unchanged one\n"
 msgstr "%s 是沒有改變的那一個\n"
 
-#: g10/keyring.c:1261
+#: g10/keyring.c:1328
 #, c-format
 msgid "%s is the new one\n"
 msgstr "%s 是新的那一個\n"
 
-#: g10/keyring.c:1262
+#: g10/keyring.c:1329
 msgid "Please fix this possible security flaw\n"
 msgstr "請修補這個可能的安全漏洞\n"
 
-#: g10/keyring.c:1384
+#: g10/keyring.c:1430
 #, c-format
 msgid "caching keyring `%s'\n"
 msgstr "快取鑰匙圈 `%s' 中\n"
 
-#: g10/keyring.c:1430
+#: g10/keyring.c:1476
 #, c-format
 msgid "%lu keys cached so far (%lu signatures)\n"
 msgstr "目前已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1442
+#: g10/keyring.c:1488
 #, c-format
 msgid "%lu keys cached (%lu signatures)\n"
 msgstr "已檢查 %lu 把金鑰 (共 %lu 份簽章)\n"
 
-#: g10/keyring.c:1514
+#: g10/keyring.c:1560
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s: 鑰匙圈已建立\n"
@@ -4639,7 +4640,7 @@ msgstr "已停用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 
-#: g10/keyserver.c:828 g10/keyserver.c:1450
+#: g10/keyserver.c:828 g10/keyserver.c:1452
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
@@ -4653,121 +4654,121 @@ msgstr "在金鑰伺服器上找不到金鑰 \"%s\"\n"
 msgid "key not found on keyserver\n"
 msgstr "在金鑰伺服器上找不到金鑰\n"
 
-#: g10/keyserver.c:1169
+#: g10/keyserver.c:1171
 #, c-format
 msgid "requesting key %s from %s server %s\n"
 msgstr "正在請求金鑰 %s 自 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1173
+#: g10/keyserver.c:1175
 #, c-format
 msgid "requesting key %s from %s\n"
 msgstr "正在請求金鑰 %s 自 %s\n"
 
-#: g10/keyserver.c:1197
+#: g10/keyserver.c:1199
 #, c-format
 msgid "searching for names from %s server %s\n"
 msgstr "正在從 %s 伺服器 %s 搜尋名字\n"
 
-#: g10/keyserver.c:1200
+#: g10/keyserver.c:1202
 #, c-format
 msgid "searching for names from %s\n"
 msgstr "正在從 %s 搜尋名字\n"
 
-#: g10/keyserver.c:1353
+#: g10/keyserver.c:1355
 #, c-format
 msgid "sending key %s to %s server %s\n"
 msgstr "遞送金鑰 %s 至 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1357
+#: g10/keyserver.c:1359
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "遞送金鑰 %s 至 %s\n"
 
-#: g10/keyserver.c:1400
+#: g10/keyserver.c:1402
 #, c-format
 msgid "searching for \"%s\" from %s server %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 
-#: g10/keyserver.c:1403
+#: g10/keyserver.c:1405
 #, c-format
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1410 g10/keyserver.c:1506
+#: g10/keyserver.c:1412 g10/keyserver.c:1508
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:1460
 #, c-format
 msgid "WARNING: keyserver handler from a different version of GnuPG (%s)\n"
 msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n"
 
-#: g10/keyserver.c:1467
+#: g10/keyserver.c:1469
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1529 g10/keyserver.c:2058
+#: g10/keyserver.c:1531 g10/keyserver.c:2060
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
-#: g10/keyserver.c:1535
+#: g10/keyserver.c:1537
 msgid "external keyserver calls are not supported in this build\n"
 msgstr "本版並不支援外部金鑰伺服器叫用\n"
 
-#: g10/keyserver.c:1547
+#: g10/keyserver.c:1549
 #, c-format
 msgid "no handler for keyserver scheme `%s'\n"
 msgstr "沒有 `%s' 金鑰伺服器架構的經手程式\n"
 
-#: g10/keyserver.c:1552
+#: g10/keyserver.c:1554
 #, c-format
 msgid "action `%s' not supported with keyserver scheme `%s'\n"
 msgstr "`%s' 動作在 `%s' 金鑰伺服器架構中未支援\n"
 
-#: g10/keyserver.c:1560
+#: g10/keyserver.c:1562
 #, c-format
 msgid "%s does not support handler version %d\n"
 msgstr "%s 並不支援第 %d 版經手程式\n"
 
-#: g10/keyserver.c:1567
+#: g10/keyserver.c:1569
 msgid "keyserver timed out\n"
 msgstr "金鑰伺服器逾時\n"
 
-#: g10/keyserver.c:1572
+#: g10/keyserver.c:1574
 msgid "keyserver internal error\n"
 msgstr "金鑰伺服器內部錯誤\n"
 
-#: g10/keyserver.c:1581
+#: g10/keyserver.c:1583
 #, c-format
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊錯誤: %s\n"
 
-#: g10/keyserver.c:1606 g10/keyserver.c:1640
+#: g10/keyserver.c:1608 g10/keyserver.c:1642
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
 
-#: g10/keyserver.c:1899
+#: g10/keyserver.c:1901
 #, c-format
 msgid "WARNING: unable to refresh key %s via %s: %s\n"
 msgstr "警告: 無法更新金鑰 %s 於 %s: %s\n"
 
-#: g10/keyserver.c:1921
+#: g10/keyserver.c:1923
 #, c-format
 msgid "refreshing 1 key from %s\n"
 msgstr "更新 1 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1923
+#: g10/keyserver.c:1925
 #, c-format
 msgid "refreshing %d keys from %s\n"
 msgstr "更新 %d 份金鑰中 (從 %s )\n"
 
-#: g10/keyserver.c:1979
+#: g10/keyserver.c:1981
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告: 無法抓取 URI %s: %s\n"
 
-#: g10/keyserver.c:1985
+#: g10/keyserver.c:1987
 #, c-format
 msgid "WARNING: unable to parse URI %s\n"
 msgstr "警告: 無法剖析 URI %s\n"
@@ -5126,7 +5127,7 @@ msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:294 g10/passphrase.c:587
+#: g10/passphrase.c:294 g10/passphrase.c:588
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
@@ -5158,7 +5159,11 @@ msgstr "由使用者所取消\n"
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題: %s\n"
 
-#: g10/passphrase.c:566
+#: g10/passphrase.c:458 jnlib/argparse.c:213
+msgid "out of core\n"
+msgstr "超出核心\n"
+
+#: g10/passphrase.c:567
 #, c-format
 msgid ""
 "You need a passphrase to unlock the secret key for\n"
@@ -5167,12 +5172,12 @@ msgstr ""
 "你需要用密語來解開下列使用者的\n"
 "私鑰: \"%s\"\n"
 
-#: g10/passphrase.c:574
+#: g10/passphrase.c:575
 #, c-format
 msgid "%u-bit %s key, ID %s, created %s"
 msgstr "%u 位元長的 %s 金鑰, ID %s, 建立於 %s"
 
-#: g10/passphrase.c:583
+#: g10/passphrase.c:584
 #, c-format
 msgid "         (subkey on main key ID %s)"
 msgstr "         (在主鑰 ID %s 上的子鑰)"
@@ -6281,10 +6286,6 @@ 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"
@@ -6315,40 +6316,40 @@ msgstr "iconv_open 失敗: %s\n"
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "從 `%s' 轉換成 `%s' 失敗: %s\n"
 
-#: jnlib/dotlock.c:235
+#: jnlib/dotlock.c:234
 #, c-format
 msgid "failed to create temporary file `%s': %s\n"
 msgstr "無法建立暫存檔 `%s': %s\n"
 
-#: jnlib/dotlock.c:270
+#: jnlib/dotlock.c:269
 #, c-format
 msgid "error writing to `%s': %s\n"
 msgstr "寫入 %s 時出錯: %s\n"
 
-#: jnlib/dotlock.c:454
+#: jnlib/dotlock.c:453
 #, c-format
 msgid "removing stale lockfile (created by %d)\n"
 msgstr "正在移除陳腐的鎖定檔 (由 %d 所建立)\n"
 
-#: jnlib/dotlock.c:460
+#: jnlib/dotlock.c:459
 msgid " - probably dead - removing lock"
 msgstr " - 可能已經掛掉了 - 正在移除鎖定"
 
-#: jnlib/dotlock.c:470
+#: jnlib/dotlock.c:469
 #, c-format
 msgid "waiting for lock (held by %d%s) %s...\n"
 msgstr "正在等候鎖定 (被 %d%s 持有) %s...\n"
 
-#: jnlib/dotlock.c:471
+#: jnlib/dotlock.c:470
 msgid "(deadlock?) "
 msgstr "(死結嗎?) "
 
-#: jnlib/dotlock.c:494
+#: jnlib/dotlock.c:493
 #, c-format
 msgid "lock `%s' not made: %s\n"
 msgstr "未鎖定 `%s': %s\n"
 
-#: jnlib/dotlock.c:502
+#: jnlib/dotlock.c:501
 #, c-format
 msgid "waiting for lock %s...\n"
 msgstr "正在等候 `%s' 鎖定...\n"
@@ -6377,58 +6378,68 @@ msgstr ""
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:624 scd/app-openpgp.c:1496 scd/app-openpgp.c:1515
-#: scd/app-openpgp.c:1666 scd/app-openpgp.c:1684 scd/app-openpgp.c:1884
+#: scd/app-nks.c:712 scd/app-openpgp.c:2373
+#, 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
+#, 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
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回 PIN 時傳回錯誤: %s\n"
 
-#: scd/app-nks.c:657
+#: scd/app-nks.c:833
 msgid "the NullPIN has not yet been changed\n"
 msgstr "NullPIN 還沒有變更過\n"
 
-#: scd/app-nks.c:848
+#: scd/app-nks.c:1090
 #, fuzzy
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "||請在讀卡機鍵盤上輸入你的 PIN"
 
-#: scd/app-nks.c:849
+#: scd/app-nks.c:1091
 #, fuzzy
 msgid "||Please enter the PIN for the standard keys."
 msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN"
 
-#: scd/app-nks.c:855
+#: scd/app-nks.c:1097
 #, fuzzy
 msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-nks.c:857
+#: scd/app-nks.c:1099
 #, fuzzy
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-nks.c:865
+#: scd/app-nks.c:1107
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:867
+#: scd/app-nks.c:1109
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:875
+#: scd/app-nks.c:1117
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:877
+#: scd/app-nks.c:1119
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr ""
 
-#: scd/app-nks.c:978 scd/app-openpgp.c:1928 scd/app-dinsig.c:531
+#: scd/app-nks.c:1220 scd/app-openpgp.c:1930 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的 PIN 時出錯: %s\n"
@@ -6448,15 +6459,15 @@ msgstr "存放創生日期失敗: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2578
+#: scd/app-openpgp.c:1112 scd/app-openpgp.c:2608
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2586
+#: scd/app-openpgp.c:1120 scd/app-openpgp.c:2616
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2596
+#: scd/app-openpgp.c:1129 scd/app-openpgp.c:2626
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
@@ -6485,7 +6496,7 @@ 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:2895
+#: scd/app-openpgp.c:2925
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
@@ -6494,11 +6505,11 @@ msgstr "驗證 CHV%d 失敗: %s\n"
 msgid "access to admin commands is not configured\n"
 msgstr "管理者指令存取權限尚未組態\n"
 
-#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1866 scd/app-openpgp.c:3146
+#: scd/app-openpgp.c:1621 scd/app-openpgp.c:1868 scd/app-openpgp.c:3188
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3155
+#: scd/app-openpgp.c:1627 scd/app-openpgp.c:3197
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
@@ -6520,108 +6531,98 @@ msgstr "|A|請在讀卡機鍵盤上輸入管理者 PIN%%0A[剩餘嘗試次數: %
 msgid "|A|Please enter the Admin PIN"
 msgstr "||請輸入 PIN"
 
-#: scd/app-openpgp.c:1880
+#: scd/app-openpgp.c:1882
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-openpgp.c:1889 scd/app-openpgp.c:1952
+#: scd/app-openpgp.c:1891 scd/app-openpgp.c:1954
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1923
+#: scd/app-openpgp.c:1925
 msgid "|RN|New Reset Code"
 msgstr "|RN|新增重設碼"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新增管理者 PIN"
 
-#: scd/app-openpgp.c:1924
+#: scd/app-openpgp.c:1926
 msgid "|N|New PIN"
 msgstr "|N|新增 PIN"
 
-#: scd/app-openpgp.c:2014 scd/app-openpgp.c:2664
+#: scd/app-openpgp.c:2016 scd/app-openpgp.c:2694
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:2020 scd/app-openpgp.c:2671
+#: scd/app-openpgp.c:2022 scd/app-openpgp.c:2701
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2032
 msgid "key already exists\n"
 msgstr "金鑰已存在\n"
 
-#: scd/app-openpgp.c:2034
+#: scd/app-openpgp.c:2036
 msgid "existing key will be replaced\n"
 msgstr "既有的金鑰將被取代\n"
 
-#: scd/app-openpgp.c:2036
+#: scd/app-openpgp.c:2038
 msgid "generating new key\n"
 msgstr "正在產生新的金鑰\n"
 
-#: scd/app-openpgp.c:2362
+#: scd/app-openpgp.c:2364
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:2371
-#, c-format
-msgid "RSA modulus missing or not of size %d bits\n"
-msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
-
-#: scd/app-openpgp.c:2383
-#, c-format
-msgid "RSA public exponent missing or larger than %d bits\n"
-msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
-
-#: scd/app-openpgp.c:2393 scd/app-openpgp.c:2401
+#: scd/app-openpgp.c:2395 scd/app-openpgp.c:2403
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
 
-#: scd/app-openpgp.c:2495
+#: scd/app-openpgp.c:2499
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存放金鑰失敗: %s\n"
 
-#: scd/app-openpgp.c:2555
+#: scd/app-openpgp.c:2585
 msgid "please wait while key is being generated ...\n"
 msgstr "正在產生金鑰中, 請稍候 ...\n"
 
-#: scd/app-openpgp.c:2569
+#: scd/app-openpgp.c:2598
 msgid "generating key failed\n"
 msgstr "產生金鑰時失敗\n"
 
-#: scd/app-openpgp.c:2572
+#: scd/app-openpgp.c:2601
 #, c-format
 msgid "key generation completed (%d seconds)\n"
 msgstr "金鑰產生完畢 (%d 秒)\n"
 
-#: scd/app-openpgp.c:2629
+#: scd/app-openpgp.c:2659
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "無效的 OpenPGP 卡片結構 (DO 0x93)\n"
 
-#: scd/app-openpgp.c:2679
+#: scd/app-openpgp.c:2709
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指紋與所要求的那個並不吻合\n"
 
-#: scd/app-openpgp.c:2794
+#: scd/app-openpgp.c:2824
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支援 %s 摘要演算法\n"
 
-#: scd/app-openpgp.c:2870
+#: scd/app-openpgp.c:2900
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
-#: scd/app-openpgp.c:3160
+#: scd/app-openpgp.c:3202
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:3385 scd/app-openpgp.c:3396
+#: scd/app-openpgp.c:3427 scd/app-openpgp.c:3438
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -7408,21 +7409,21 @@ msgstr "無法剖析金鑰伺服器\n"
 msgid "WARNING: running with faked system time: "
 msgstr "警告: 正在偽造的系統時間中執行: "
 
-#: sm/gpgsm.c:1508
+#: sm/gpgsm.c:1506
 #, c-format
 msgid "importing common certificates `%s'\n"
 msgstr "正在匯入通用憑證 `%s'\n"
 
-#: sm/gpgsm.c:1546
+#: sm/gpgsm.c:1544
 #, c-format
 msgid "can't sign using `%s': %s\n"
 msgstr "無法用 `%s' 來簽署: %s\n"
 
-#: sm/gpgsm.c:1717
+#: sm/gpgsm.c:1715
 msgid "this command has not yet been implemented\n"
 msgstr "這個指令尚未實做完成\n"
 
-#: sm/gpgsm.c:1872
+#: sm/gpgsm.c:1870
 msgid "invalid command (there is no implicit command)\n"
 msgstr "無效的指令 (沒有這樣的指令)\n"
 
@@ -7444,7 +7445,7 @@ msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:548 tools/gpg-connect-agent.c:1329
+#: sm/import.c:554 tools/gpg-connect-agent.c:1329
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取輸入時出錯: %s\n"
@@ -7552,17 +7553,17 @@ msgstr ""
 "\"%s\"\n"
 "請注意, 這個憑證並 不會 建立出合格的簽章!"
 
-#: sm/sign.c:420
+#: sm/sign.c:431
 #, c-format
 msgid "hash algorithm %d (%s) for signer %d not supported; using %s\n"
 msgstr "雜湊演算法 %d (%s) 為簽署者 %d 所用, 但並不支援; 改用 %s\n"
 
-#: sm/sign.c:433
+#: sm/sign.c:445
 #, c-format
 msgid "hash algorithm used for signer %d: %s (%s)\n"
 msgstr "簽署者 %d 所用的雜湊演算法: %s (%s)\n"
 
-#: sm/sign.c:483
+#: sm/sign.c:495
 #, c-format
 msgid "checking for qualified certificate failed: %s\n"
 msgstr "檢查合格憑證時失敗: %s\n"
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 60af202f2..a6fa9eb55 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-13  Werner Koch  <wk@g10code.com>
+
+	* ccid-driver.c (abort_cmd): Add arg SEQNO and change callers.
+	(bulk_in): Retry on seqno mismatch.
+
+	* apdu.c (send_le): Release result_buffer.
+	(apdu_send_direct): Implemend extended length.
+	* command.c (cmd_apdu): Add option "--exlen".
+
 2009-05-11  Werner Koch  <wk@g10code.com>
 
 	* apdu.c (send_le): Replace log_error by log_info.
diff --git a/scd/apdu.c b/scd/apdu.c
index 568f5cb97..ca05b1731 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2930,7 +2930,11 @@ send_le (int slot, int class, int ins, int p0, int p1,
 #undef SHORT_RESULT_BUFFER_SIZE
 
   if ((sw = lock_slot (slot)))
-    return sw;
+    {
+      xfree (apdu_buffer);
+      xfree (result_buffer);
+      return sw;
+    }
 
   do
     {
@@ -3003,6 +3007,8 @@ send_le (int slot, int class, int ins, int p0, int p1,
           log_info ("apdu_send_simple(%d) failed: %s\n",
                     slot, apdu_strerror (rc));
           unlock_slot (slot);
+          xfree (apdu_buffer);
+          xfree (result_buffer);
           return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
         }
       sw = (result[resultlen-2] << 8) | result[resultlen-1];
@@ -3041,6 +3047,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
           if (!*retbuf)
             {
               unlock_slot (slot);
+              xfree (result_buffer);
               return SW_HOST_OUT_OF_CORE;
             }
           *retbuflen = resultlen;
@@ -3060,6 +3067,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
           if (!*retbuf)
             {
               unlock_slot (slot);
+              xfree (result_buffer);
               return SW_HOST_OUT_OF_CORE;
             }
           assert (resultlen < bufsize);
@@ -3091,6 +3099,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
               log_error ("apdu_send_simple(%d) for get response failed: %s\n",
                          slot, apdu_strerror (rc));
               unlock_slot (slot);
+              xfree (result_buffer);
               return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
             }
           sw = (result[resultlen-2] << 8) | result[resultlen-1];
@@ -3116,6 +3125,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
                       if (!tmp)
                         {
                           unlock_slot (slot);
+                          xfree (result_buffer);
                           return SW_HOST_OUT_OF_CORE;
                         }
                       p = tmp + (p - *retbuf);
@@ -3142,6 +3152,7 @@ send_le (int slot, int class, int ins, int p0, int p1,
     }
 
   unlock_slot (slot);
+  xfree (result_buffer);
 
   if (DBG_CARD_IO && retbuf && sw == SW_SUCCESS)
     log_printhex ("      dump: ", *retbuf, *retbuflen);
@@ -3231,23 +3242,27 @@ apdu_send_simple_kp (int slot, int class, int ins, int p0, int p1,
    and returns with an APDU including the status word.  With
    HANDLE_MORE set to true this function will handle the MORE DATA
    status and return all APDUs concatenated with one status word at
-   the end.  If EXTENDED_MODE is not 0 command chaining or extended
-   length will be used; see send_le for details.  The function does
-   not return a regular status word but 0 on success.  If the slot is
-   locked, the function returns immediately with an error.  */
+   the end.  If EXTENDED_LENGTH is != 0 extended lengths are allowed
+   with a max. result data length of EXTENDED_LENGTH bytes.  The
+   function does not return a regular status word but 0 on success.
+   If the slot is locked, the function returns immediately with an
+   error.  */
 int
-apdu_send_direct (int slot, int extended_mode,
+apdu_send_direct (int slot, size_t extended_length,
                   const unsigned char *apdudata, size_t apdudatalen,
                   int handle_more,
                   unsigned char **retbuf, size_t *retbuflen)
 {
-#define RESULTLEN 258
-  /* FIXME:  Implement dynamic result buffer and extended Le.  */
-  unsigned char apdu[5+256+1];
-  size_t apdulen;
-  unsigned char result[RESULTLEN+10]; /* 10 extra in case of bugs in
-                                         the driver. */
+#define SHORT_RESULT_BUFFER_SIZE 258
+  unsigned char short_result_buffer[SHORT_RESULT_BUFFER_SIZE+10]; 
+  unsigned char *result_buffer = NULL;
+  size_t result_buffer_size;
+  unsigned char *result;
   size_t resultlen;
+  unsigned char short_apdu_buffer[5+256+10];
+  unsigned char *apdu_buffer = NULL;
+  unsigned char *apdu;
+  size_t apdulen;
   int sw;
   long rc; /* we need a long here due to PC/SC. */
   int class;
@@ -3255,26 +3270,59 @@ apdu_send_direct (int slot, int extended_mode,
   if (slot < 0 || slot >= MAX_READER || !reader_table[slot].used )
     return SW_HOST_NO_DRIVER;
 
-  if (extended_mode)
-    return SW_HOST_NOT_SUPPORTED; /* FIXME. */
+  if (apdudatalen > 65535)
+    return SW_HOST_INV_VALUE;
 
-  if ((sw = trylock_slot (slot)))
-    return sw;
-
-  /* We simply trunctate a too long APDU.  */
-  if (apdudatalen > sizeof apdu)
-    apdudatalen = sizeof apdu;
+  if (apdudatalen > sizeof short_apdu_buffer - 5)
+    {
+      apdu_buffer = xtrymalloc (apdudatalen + 5);
+      if (!apdu_buffer)
+        return SW_HOST_OUT_OF_CORE;
+      apdu = apdu_buffer;
+    }
+  else
+    {
+      apdu = short_apdu_buffer;
+    }
   apdulen = apdudatalen;
   memcpy (apdu, apdudata, apdudatalen);
   class = apdulen? *apdu : 0;
 
-  resultlen = RESULTLEN;
+  if (extended_length >= 256 && extended_length <= 65536)
+    {
+      result_buffer_size = extended_length;
+      result_buffer = xtrymalloc (result_buffer_size + 10);
+      if (!result_buffer)
+        {
+          xfree (apdu_buffer);
+          return SW_HOST_OUT_OF_CORE;
+        }
+      result = result_buffer;
+    }
+  else
+    {
+      result_buffer_size = SHORT_RESULT_BUFFER_SIZE;
+      result = short_result_buffer;
+    }
+#undef SHORT_RESULT_BUFFER_SIZE
+
+  if ((sw = trylock_slot (slot)))
+    {
+      xfree (apdu_buffer);
+      xfree (result_buffer);
+      return sw;
+    }
+
+  resultlen = result_buffer_size;
   rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL);
+  xfree (apdu_buffer);
+  apdu_buffer = NULL;
   if (rc || resultlen < 2)
     {
       log_error ("apdu_send_direct(%d) failed: %s\n",
                  slot, apdu_strerror (rc));
       unlock_slot (slot);
+      xfree (result_buffer);
       return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
     }
   sw = (result[resultlen-2] << 8) | result[resultlen-1];
@@ -3301,6 +3349,7 @@ apdu_send_direct (int slot, int extended_mode,
           if (!*retbuf)
             {
               unlock_slot (slot);
+              xfree (result_buffer);
               return SW_HOST_OUT_OF_CORE;
             }
           assert (resultlen < bufsize);
@@ -3315,20 +3364,22 @@ apdu_send_direct (int slot, int extended_mode,
           if (DBG_CARD_IO)
             log_debug ("apdu_send_direct(%d): %d more bytes available\n",
                        slot, len);
+          apdu = short_apdu_buffer;
           apdulen = 0;
           apdu[apdulen++] = class;
           apdu[apdulen++] = 0xC0;
           apdu[apdulen++] = 0;
           apdu[apdulen++] = 0;
           apdu[apdulen++] = len;
-          memset (apdu+apdulen, 0, sizeof (apdu) - apdulen);
-          resultlen = RESULTLEN;
+          memset (apdu+apdulen, 0, sizeof (short_apdu_buffer) - apdulen);
+          resultlen = result_buffer_size;
           rc = send_apdu (slot, apdu, apdulen, result, &resultlen, NULL);
           if (rc || resultlen < 2)
             {
               log_error ("apdu_send_direct(%d) for get response failed: %s\n",
                          slot, apdu_strerror (rc));
               unlock_slot (slot);
+              xfree (result_buffer);
               return rc ? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE;
             }
           sw = (result[resultlen-2] << 8) | result[resultlen-1];
@@ -3354,6 +3405,7 @@ apdu_send_direct (int slot, int extended_mode,
                       if (!tmp)
                         {
                           unlock_slot (slot);
+                          xfree (result_buffer);
                           return SW_HOST_OUT_OF_CORE;
                         }
                       p = tmp + (p - *retbuf);
@@ -3386,6 +3438,7 @@ apdu_send_direct (int slot, int extended_mode,
           if (!*retbuf)
             {
               unlock_slot (slot);
+              xfree (result_buffer);
               return SW_HOST_OUT_OF_CORE;
             }
           *retbuflen = resultlen;
@@ -3394,6 +3447,7 @@ apdu_send_direct (int slot, int extended_mode,
     }
 
   unlock_slot (slot);
+  xfree (result_buffer);
 
   /* Append the status word.  Note that we reserved the two extra
      bytes while allocating the buffer.  */
@@ -3407,5 +3461,4 @@ apdu_send_direct (int slot, int extended_mode,
     log_printhex ("      dump: ", *retbuf, *retbuflen);
 
   return 0;
-#undef RESULTLEN
 }
diff --git a/scd/apdu.h b/scd/apdu.h
index 2a932df38..3261fa6b9 100644
--- a/scd/apdu.h
+++ b/scd/apdu.h
@@ -125,7 +125,7 @@ int apdu_send_le (int slot, int extended_mode,
                   int class, int ins, int p0, int p1,
                   int lc, const char *data, int le,
                   unsigned char **retbuf, size_t *retbuflen);
-int apdu_send_direct (int slot, int extended_mode,
+int apdu_send_direct (int slot, size_t extended_length,
                       const unsigned char *apdudata, size_t apdudatalen,
                       int handle_more,
                       unsigned char **retbuf, size_t *retbuflen);
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 75a38ca2e..8d0df52ee 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -271,7 +271,7 @@ static int bulk_out (ccid_driver_t handle, unsigned char *msg, size_t msglen,
 static int bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
                     size_t *nread, int expected_type, int seqno, int timeout,
                     int no_debug);
-static int abort_cmd (ccid_driver_t handle);
+static int abort_cmd (ccid_driver_t handle, int seqno);
 
 /* Convert a little endian stored 4 byte value into an unsigned
    integer. */
@@ -1832,9 +1832,11 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
         {
           rc = errno;
           DEBUGOUT_1 ("usb_bulk_read error: %s\n", strerror (rc));
-          if (rc == EAGAIN && eagain_retries++ < 5)
+          if (rc == EAGAIN && eagain_retries++ < 3)
             {
+#ifndef TEST
               gnupg_sleep (1);
+#endif
               goto retry;
             }
           return CCID_DRIVER_ERR_CARD_IO_ERROR;
@@ -1851,7 +1853,9 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
                       handle->dev_fd, strerror (rc));
           if (rc == EAGAIN && eagain_retries++ < 5)
             {
+#ifndef TEST
               gnupg_sleep (1);
+#endif
               goto retry;
             }
           return CCID_DRIVER_ERR_CARD_IO_ERROR;
@@ -1863,21 +1867,20 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
   if (msglen < 10)
     {
       DEBUGOUT_1 ("bulk-in msg too short (%u)\n", (unsigned int)msglen);
-      abort_cmd (handle);
+      abort_cmd (handle, seqno);
       return CCID_DRIVER_ERR_INV_VALUE;
     }
   if (buffer[5] != 0)    
     {
       DEBUGOUT_1 ("unexpected bulk-in slot (%d)\n", buffer[5]);
-      abort_cmd (handle);
       return CCID_DRIVER_ERR_INV_VALUE;
     }
   if (buffer[6] != seqno)    
     {
       DEBUGOUT_2 ("bulk-in seqno does not match (%d/%d)\n",
                   seqno, buffer[6]);
-      abort_cmd (handle);
-      return CCID_DRIVER_ERR_INV_VALUE;
+      /* Retry until we are synced again.  */
+      goto retry;
     }
 
   /* We need to handle the time extension request before we check that
@@ -1895,7 +1898,7 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
   if (buffer[0] != expected_type)
     {
       DEBUGOUT_1 ("unexpected bulk-in msg type (%02x)\n", buffer[0]);
-      abort_cmd (handle);
+      abort_cmd (handle, seqno);
       return CCID_DRIVER_ERR_INV_VALUE;
     }
 
@@ -1943,11 +1946,10 @@ bulk_in (ccid_driver_t handle, unsigned char *buffer, size_t length,
 
 /* Send an abort sequence and wait until everything settled.  */
 static int
-abort_cmd (ccid_driver_t handle)
+abort_cmd (ccid_driver_t handle, int seqno)
 {
   int rc;
   char dummybuf[8];
-  unsigned char seqno;
   unsigned char msg[100];
   size_t msglen;
 
@@ -1957,12 +1959,11 @@ abort_cmd (ccid_driver_t handle)
       rc = CCID_DRIVER_ERR_NOT_SUPPORTED;
     }
   
-  DEBUGOUT ("sending abort sequence\n");
+  seqno &= 0xff;
+  DEBUGOUT_1 ("sending abort sequence for seqno %d\n", seqno);
   /* Send the abort command to the control pipe.  Note that we don't
      need to keep track of sent abort commands because there should
      never be another thread using the same slot concurrently.  */
-  handle->seqno--;  /* Restore the last one sent.  */
-  seqno = (handle->seqno & 0xff);
   rc = usb_control_msg (handle->idev, 
                         0x21,/* bmRequestType: host-to-device,
                                 class specific, to interface.  */
@@ -2039,7 +2040,7 @@ abort_cmd (ccid_driver_t handle)
     }
   while (msg[0] != RDR_to_PC_SlotStatus && msg[5] != 0 && msg[6] != seqno);
 
-  handle->seqno = seqno;
+  handle->seqno = ((seqno + 1) & 0xff);
   DEBUGOUT ("sending abort sequence succeeded\n");
 
   return 0;
@@ -2178,7 +2179,7 @@ ccid_poll (ccid_driver_t handle)
 }
 
 
-/* Note that this fucntion won't return the error codes NO_CARD or
+/* Note that this function won't return the error codes NO_CARD or
    CARD_INACTIVE */
 int 
 ccid_slot_status (ccid_driver_t handle, int *statusbits)
@@ -3298,13 +3299,6 @@ main (int argc, char **argv)
   return 0;
 }
 
-static coid
-gnupg_sleep (int seconds)
-{
-  sleep (seconds);
-}
-
-
 /*
  * Local Variables:
  *  compile-command: "gcc -DTEST -Wall -I/usr/local/include -lusb -g ccid-driver.c"
diff --git a/scd/command.c b/scd/command.c
index 6c1cdd072..ae1f4981b 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -202,7 +202,7 @@ has_option (const char *line, const char *name)
 /* Same as has_option but does only test for the name of the option
    and ignores an argument, i.e. with NAME being "--hash" it would
    return a pointer for "--hash" as well as for "--hash=foo".  If
-   thhere is no such option NULL is returned.  The pointer returned
+   there is no such option NULL is returned.  The pointer returned
    points right behind the option name, this may be an equal sign, Nul
    or a space.  */
 static const char *
@@ -1722,7 +1722,7 @@ cmd_disconnect (assuan_context_t ctx, char *line)
 
 
 
-/* APDU [--atr] [--more] [hexstring]
+/* APDU [--atr] [--more] [--exlen[=N]] [hexstring]
 
    Send an APDU to the current reader.  This command bypasses the high
    level functions and sends the data directly to the card.  HEXSTRING
@@ -1735,8 +1735,11 @@ cmd_disconnect (assuan_context_t ctx, char *line)
      S CARD-ATR 3BFA1300FF813180450031C173C00100009000B1
 
    Using the option --more handles the card status word MORE_DATA
-   (61xx) and concatenate all reponses to one block.
+   (61xx) and concatenates all reponses to one block.
 
+   Using the option "--exlen" the returned APDU may use extended
+   length up to N bytes.  If N is not given a default value is used
+   (currently 4096).
  */
 static int
 cmd_apdu (assuan_context_t ctx, char *line)
@@ -1747,10 +1750,22 @@ cmd_apdu (assuan_context_t ctx, char *line)
   size_t apdulen;
   int with_atr;
   int handle_more;
+  const char *s;
+  size_t exlen;
 
   with_atr = has_option (line, "--atr");
   handle_more = has_option (line, "--more");
 
+  if ((s=has_option_name (line, "--exlen")))
+    {
+      if (*s == '=')
+        exlen = strtoul (s+1, NULL, 0);
+      else
+        exlen = 4096;
+    }
+  else
+    exlen = 0;
+
   line = skip_options (line);
 
   if ( IS_LOCKED (ctrl) )
@@ -1787,7 +1802,8 @@ cmd_apdu (assuan_context_t ctx, char *line)
       unsigned char *result = NULL;
       size_t resultlen;
 
-      rc = apdu_send_direct (ctrl->reader_slot, 0, apdu, apdulen, handle_more,
+      rc = apdu_send_direct (ctrl->reader_slot, exlen,
+                             apdu, apdulen, handle_more,
                              &result, &resultlen);
       if (rc)
         log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc));