Prepare a releasegnupg-2.0.16

author: Werner Koch <[email protected]> 2010-07-19 07:05:30 +0000
committer: Werner Koch <[email protected]> 2010-07-19 07:05:30 +0000
commit: ec45cd2d20f96d5142c68669e2e620321b774876 (patch)
tree: 2d39b87132bd3e644bd61a79b6c9f520638b6c91
parent: Backport bug fix. Fixes bug#1240. (diff)
download: gnupg-ec45cd2d20f96d5142c68669e2e620321b774876.tar.gz
gnupg-ec45cd2d20f96d5142c68669e2e620321b774876.zip
30 files changed, 11965 insertions, 11998 deletions
diff --git a/ChangeLog b/ChangeLog
index c27654a13..c35ea4298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-07-19  Werner Koch  <[email protected]>
+
+	Release 2.0.16.
+
+	* configure.ac: Require libgpg-error 1.7 and libksba 1.0.7 to
+	force building with more recent versions.
+
 2010-05-04  Werner Koch  <[email protected]>
 
 	* configure.ac: Add option --enable-standard-socket.
diff --git a/NEWS b/NEWS
index f204eae81..6d779a499 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Noteworthy changes in version 2.0.16 (unreleased)
+Noteworthy changes in version 2.0.16 (2010-07-19)
 -------------------------------------------------
 
  * If the agent's --use-standard-socket option is active, all tools
diff --git a/configure.ac b/configure.ac
index 4fd3e4c3f..3fde24c4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ min_automake_version="1.10"
 # Set my_issvn to "yes" for non-released code.  Remember to run an
 # "svn up" and "autogen.sh" right before creating a distribution.
 m4_define([my_version], [2.0.16])
-m4_define([my_issvn], [yes])
+m4_define([my_issvn], [no])
 
 m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
           | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
@@ -37,7 +37,7 @@ AC_INIT([gnupg],
 # sufficient.
 development_version=no
 
-NEED_GPG_ERROR_VERSION=1.4
+NEED_GPG_ERROR_VERSION=1.7
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.4.0
@@ -46,7 +46,7 @@ NEED_LIBASSUAN_API=2
 NEED_LIBASSUAN_VERSION=2.0.0
 
 NEED_KSBA_API=1
-NEED_KSBA_VERSION=1.0.2
+NEED_KSBA_VERSION=1.0.7
 
 
 PACKAGE=$PACKAGE_NAME
diff --git a/po/be.po b/po/be.po
index 234683175..2f6cc0c51 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2003-10-30 16:35+0200\n"
 "Last-Translator: Ales Nyakhaychyk <[email protected]>\n"
 "Language-Team: Belarusian <[email protected]>\n"
@@ -120,7 +120,7 @@ msgstr ""
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -324,7 +324,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -335,104 +335,104 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "шматслоўнасьць"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "працаваць менш шматслоўна"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr ""
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr ""
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr ""
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Паўтарыце пароль\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -440,156 +440,156 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Калі ласка, паведамляйце пра памылкі на <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Выкарыстаньне: gpg [выбары] [файлы] (-h для даведкі)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "запіс у stdout\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: тэчка створана\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -794,7 +794,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -809,7 +809,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -819,7 +819,7 @@ msgstr "памылка стварэньня \"%s\": %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
@@ -931,11 +931,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1182,46 +1187,46 @@ msgstr "нечаканыя даньні"
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr ""
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr ""
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr ""
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr ""
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "памылка CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr ""
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr ""
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr ""
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr ""
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1262,7 +1267,7 @@ msgstr "сакрэтны ключ недаступны"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
@@ -1536,7 +1541,7 @@ msgstr ""
 msgid "error writing key to card: %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr ""
 
@@ -1545,7 +1550,7 @@ msgstr ""
 msgid "show admin commands"
 msgstr "несумяшчальныя загады\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "паказаць гэтую даведку"
 
@@ -1624,7 +1629,7 @@ msgstr "несумяшчальныя загады\n"
 msgid "Admin commands are not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 
@@ -1632,18 +1637,18 @@ msgstr "Нерэчаісны загад (паспрабуйце \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1917,7 +1922,7 @@ msgstr "паказаць ключы й адбіткі пальцаў"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2155,7 +2160,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr ""
 
@@ -2163,7 +2168,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr ""
 
@@ -2301,402 +2306,402 @@ msgstr ""
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr ""
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr ""
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "недапушчальныя выбары імпартаваньня\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s - гэта недапушчальнае мноства знакаў\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не дазваляецца разам з %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "запіс у stdout\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr ""
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "недапушчальныя дапомныя перавагі\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr ""
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ня мае сэнсу разам з %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [назва_файла]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [назва_файла]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [назва_файла]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [назва_файла]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [назва_файла]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [назва_файла]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [назва_файла]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [назва_файла]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [загады]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[назва_файла]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr ""
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr ""
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr ""
 
@@ -2846,330 +2851,335 @@ msgstr "Подпіс створаны ў %.*s з выкарыстаньнем %s
 msgid "      user IDs cleaned: %lu\n"
 msgstr ""
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "нерэчаісны хэш-альгарытм \"%s\"\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr ""
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr ""
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr ""
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr ""
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr ""
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr ""
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr ""
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%s: немагчыма стварыць тэчку: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr ""
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr ""
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr ""
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr ""
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr ""
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "сакрэтны ключ недаступны"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr ""
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr ""
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr ""
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr ""
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1433
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
-msgid "key %s: no subkey for key binding\n"
+msgid "key %s: unsupported public key algorithm\n"
 msgstr ""
 
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "%s: тэчка створана\n"
+
+#: g10/import.c:1501
 #, c-format
-msgid "key %s: unsupported public key algorithm\n"
+msgid "key %s: no subkey for key binding\n"
 msgstr ""
 
-#: g10/import.c:1446
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr ""
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr ""
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%s:%d: недапушчальныя выбары экспартаваньня\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr ""
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "Ключ абаронены.\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr ""
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr ""
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%s: тэчка створана\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -3272,12 +3282,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr ""
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr ""
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3450,8 +3460,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "збой падпісаньня: %s\n"
@@ -3504,190 +3514,190 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr ""
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "паказаць ключы й адбіткі пальцаў"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr ""
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "праверыць подпісы ключа"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr ""
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr ""
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "дрэнны ключ"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "паказаць сакрэтныя ключы"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr ""
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr ""
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr ""
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr ""
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr ""
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr ""
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "падпісаць ключ"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "паказаць сьпіс ключоў"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Даступны сакрэтны ключ.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3695,161 +3705,161 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr ""
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "падпісаць ключ толькі мясцова"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "невядомая вэрсыя"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr ""
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "памылка стварэньня \"%s\": %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "паказаць сьпіс ключоў і ID карыстальнікаў"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr ""
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Захаваць зьмены? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Выйсьці не захаваўшы зьмены? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3857,360 +3867,360 @@ msgstr ""
 "Выбары:\n"
 " "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "збой падпісаньня: %s\n"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr ""
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr ""
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr ""
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr ""
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr ""
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "паказаць сьпіс ключоў і подпісаў"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "грамадскі ключ ня знойдзены"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Калі ласка, абярыце від ключа, які Вам патрэбны:\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Перазапісаць (y/N)?"
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "памылка чытаньня файла"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr ""
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr ""
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr ""
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "выдаліць ключы са зьвязку сакрэтных ключоў"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5312,11 +5322,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5678,28 +5688,28 @@ msgstr "паказаць сьпіс ключоў і ID карыстальнік�
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Калі ласка, задайце назву файла даньняў: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "чытаецца stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "немагчыма адкрыць %s: %s\n"
diff --git a/po/ca.po b/po/ca.po
index decec60a2..3486c3b3c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2005-02-04 02:04+0100\n"
 "Last-Translator: Jordi Mallach <[email protected]>\n"
 "Language-Team: Catalan <[email protected]>\n"
@@ -142,7 +142,7 @@ msgstr "no s'ha pogut crear «%s»: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -351,7 +351,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "canvia la contrasenya"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -362,109 +362,109 @@ msgstr ""
 "Opcions:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
 # Un dels dos és en la llista d'opcions amb --help. Urgh. jm
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detall"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "una mica més silenciós"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FITXER|carrega el mòdul d'extensió especificat"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca claus en un servidor de claus"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualitza la base de dades de confiança"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "error en la creació de la contrasenya: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -472,158 +472,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Si us plau, informeu sobre els errors a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Forma d'ús: gpg [opcions] [fitxers] (-h per a veure l'ajuda)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fitxer d'opcions «%s»: %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "s'estan llegint opcions de «%s»\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no es pot crear el directori «%s»: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "no s'ha pogut crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificat de revocació vàlid"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "error en crear «%s»: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error mentre s'enviava a «%s»: %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: s'ha creat el directori\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, 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:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, 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:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu claus es descarta\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent no està disponible en aquesta sessió\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "la variable d'entorn GPG_AGENT_INFO és malformada\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -832,7 +832,7 @@ msgstr "error en la creació de la contrasenya: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no es pot obrir el fitxer: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -847,7 +847,7 @@ msgstr ""
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -857,7 +857,7 @@ msgstr "error en la lectura de «%s»: %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error en la lectura de «%s»: %s\n"
@@ -974,11 +974,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1247,47 +1252,47 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "la línia escapada amb guió és invàlida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "el caràcter radix64 %02x invàlid s'ha omés\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "fi de fitxer prematur (no CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "fi de fitxer prematur (en CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC malformat\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "error de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fí de fitxer prematur (al final)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "error en l'última línia\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "no s'han trobat dades OpenPGP vàlides.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "l'armadura és invàlida: la línia és més llarga que %d caràcters\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1335,7 +1340,7 @@ msgstr ""
 
 # Destès? ivb
 # Desatès, sí. jm
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1620,7 +1625,7 @@ msgstr "es descarta: la clau secreta ja és present\n"
 msgid "error writing key to card: %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "ix del menú"
 
@@ -1631,7 +1636,7 @@ msgstr "les ordres entren en conflicte\n"
 
 # «pantalla» o «ajuda»?  ivb
 # «ajuda», evidentment. jm
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "mostra aquesta ajuda"
 
@@ -1709,7 +1714,7 @@ msgstr ""
 msgid "Admin commands are not allowed\n"
 msgstr ""
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "L'ordre no és vàlida (proveu «help»)\n"
 
@@ -1717,18 +1722,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -2031,7 +2036,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "La clau invàlida %08lX s'ha fet vàlida amb --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2284,7 +2289,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clau pública: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Xifratge: "
 
@@ -2292,7 +2297,7 @@ msgstr "Xifratge: "
 msgid "Hash: "
 msgstr "Dispersió: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compressió: "
 
@@ -2437,414 +2442,414 @@ msgstr "NOTA: es descarta el fitxer d'opcions predeterminades antic «%s»\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s no és per a ús normal!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opcions d'importanció no vàlides\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opcions d'importació no vàlides\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s no és un joc de caràcters vàlid\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "no s'ha pogut fixar l'exec-path a %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d opcions d'exportació no vàlides\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVÍS: el programa podria crear un fitxer core!\n"
 
 # FIXME: preferència? jm
 # Ho discutírem en la llista, segur.  Deu ser als arxius.  ivb
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVÍS: %s té preferència sobre %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s no és permés amb %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s no té sentit amb %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
 # clares -> en clar?  ivb
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "només podeu fer signatures separades o en clar en el mode --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no podeu signar i xifrar al mateix temps en el mode --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "heu d'utilitzar fitxers (i no un conducte) mentre treballeu amb --pgp2 "
 "habilitat.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "xifrar un missatge en mode --pgp2 requereix el xifratge IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algorisme de resum seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorisme de xifratge triat no és vàlid\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algorisme de resum de certificació seleccionat no és vàlid\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ha de ser major que 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ha de ser major que 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ha d'estar en el rang 1 a 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "default-check-level és invàlid; ha de ser 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el mode S2K simple (0) no és gens recomanable\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "el mode S2K és invàlid; ha de ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "les preferències per defecte són invàlides\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "les preferències personals de xifrat són invàlides\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "les preferències personals de digest són invàlides\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "les preferències personals de compressió són invàlides\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s encara no funciona amb %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de xifratge «%s» mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de resum %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no podeu usar l'algorisme de compressió %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "no s'ha pogut inicialitzar la base de dades de confiança: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVÍS: s'han donat destinataris (-r) sense usar xifratge de clau pública\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nom_del_fitxer]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "ha fallat el desxifratge: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nom_del_fitxer]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no podeu usar %s mentre esteu en mode %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom_del_fitxer]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom_del_fitxer]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom_del_fitxer]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [ordres]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'enviament al servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la recepció des del servidor de claus ha fallat: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'exportació de la clau ha fallat: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ha fallat la cerca al servidor de claus: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "ha fallat el refresc des del servidor de claus: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "no s'ha pogut llevar l'armadura: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "no s'ha pogut crear l'armadura: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "l'algoritme de dispersió és invàlid «%s»\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nom_del_fitxer]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Endavant, escriviu el missatge...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "la URL de política de certificació donada no és vàlida\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL de política de signatura donada no és vàlida\n"
@@ -3001,197 +3006,197 @@ msgstr "        signatures noves: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr " claus privades llegides: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "signatura %s, algorisme de resum %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "clau %08lX: sense ID\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clau %08lX: corrupció de la subclau HKP reparada\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clau %08lX: s'ha acceptat la ID d'usuari no autosignada «%s»\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clau %08lX: l'ID no és vàlid\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "açò pot ser causat per l'absència d'autosignatura\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau pública: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clau %08lX: clau nova - es descarta \n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "no s'ha trobat cap anell escrivible: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "s'està escrivint en «%s»\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error mentre s'escrivia l'anell «%s»: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clau %08lX: s'ha importat la clau pública «%s»\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clau %08lX: no correspon a la nostra còpia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha trobat el bloc de claus original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clau %08lX: no s'ha pogut llegir el bloc de claus original: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clau %08lX: «%s» 1 ID d'usuari nou\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clau %08lX: «%s» 1 signatura nova\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clau %08lX: «%s» 1 subclau nova\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clau %08lX: «%s» %d subclaus noves\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clau %08lX: «%s» %d signatures noves\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clau %08lX: «%s» %d ID d'usuari nous\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clau %08lX: «%s» no ha estat modificada\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clau %08lX: clau secreta amb xifrat %d no vàlid - es descarta\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "s'està escrivint la clau secreta a «%s»\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hi ha anell secret predeterminat: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clau %08lX: s'ha importat la clau secreta\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clau %08lX: ja es troba en l'anell privat\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clau %08lX: no s'ha trobat la clau secreta: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
@@ -3201,22 +3206,22 @@ msgstr ""
 # O «rebutjara»? ivb
 # Per tots els canvis d'anglicisme «ignorat» -> «es descarta»,
 # «es rebutja» està bé. jm
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s: es rebutja\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clau %08lX: s'ha importat el certificat de revocació «%s»\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clau %08lX: no hi ha ID per a la signatura\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
@@ -3224,126 +3229,131 @@ msgstr ""
 "s»\n"
 "\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clau %08lX: l'autosignatura no és vàlida en l'id d'usuari «%s»\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clau %08lX: l'algoritme de clau pública no és suportat\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "clau %08lX: no hi ha una subclau per a l'enllaç de la clau\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clau %08lX: l'enllaç de subclau és invàlid\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clau %08lX: s'ha eliminat un enllaç de subclau múltiple\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clau %08lX: no hi ha una subclau per a la clau de revocació\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clau %08lX: Subclau de revocació no vàlida\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clau %08lX: s'han eliminat subclaus de revocació múltiples\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clau %08lX: es descarta l'ID d'usuari '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clau %08lX: es descarta la subclau\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clau %08lX: la signatura és inexportable (classe %02x) - es descarta\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "clau %08lX: el certificat de revocació és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clau %08lX: el certificat de revocació és invàlid: %s - es descarta\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "clau %08lX: la signatura de la subclau és en el lloc equivocat - es "
 "descarta\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr ""
 "clau %08lX: la classe de signatura és inesperada (0x%02x) - es descarta\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clau %08lX: s'ha detectat un ID d'usuari duplicat - es fusiona\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: s'adquireix la clau de revocació %"
 "08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVÍS: la clau %08lX pot estar revocada: la clau de revocació %08lX no està "
 "present.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clau %08lX: s'hi ha afegit el certificat de revocació «%s»\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clau %08lX: s'ha afegit la signatura de clau directa\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la clau pública no coincideix amb la clau secreta!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "es descarta: la clau secreta ja és present\n"
@@ -3451,14 +3461,14 @@ msgid "User ID \"%s\" is revoked."
 msgstr "L'ID d'usuari «%s» està revocat."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Segur que encara voleu signarla? (s/N) "
 
 # O no s'ha pogut? ivb
 # FIXME: comprovar context. jm
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  No es pot signar.\n"
 
@@ -3669,8 +3679,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Signar realment? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Ha fallat el procés de signatura: %s\n"
@@ -3727,60 +3737,60 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Esteu segur de voler fer açò? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "s'està posant la signatura al lloc correcte\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "desa i ix"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra empremta"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "llista claus i ID"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "tria l'ID d'usuari N"
 
 # Per aquesta zona (keyedit) hi ha un cacau d'infinitius i presents...  ivb
 # Yeah, els vaig corregir abans de que enviares la teua correcció. jm
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "tria l'ID d'usuari N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca signatures"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "signa la clau localment"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "afegeix un ID d'usuari"
 
@@ -3788,153 +3798,153 @@ msgstr "afegeix un ID d'usuari"
 # Si et refereixes a Photo vs. photo, ho deixe en minúscules, que en tot
 # el menú està tot en minúscules. Tb hi ha molts ID vs. id en els msgids
 # i no hem unificat en català. Potser li ho diré a Werner. jm.
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "afegeix un photo ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "esborra un ID d'usuari"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "esborra una clau secundària"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "afegeix una clau de revocació"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marca l'ID d'usuari com a primari"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "canvia entre el llistat de claus secretes i públiques"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "llista les preferències (expert)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "llista les preferències (detallat)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "no s'ha pogut analitzar sintàcticament la URI del servidor de claus\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "canvia la contrasenya"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "canvia la confiança"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un ID d'usuari"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una clau secundària"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "activa una clau"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva una clau"
 
 # Igual que dalt.  ivb
 # Idem :) jm
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra el photo ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error en llegir el bloc de claus secretes «%s»: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "La clau secreta està disponible.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Cal la clau secreta per a fer açò.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Useu l'ordre «toggle» abans.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3942,247 +3952,247 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "La clau està revocada."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realment voleu signar tots els ID d'usuari? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: Trieu els ID d'usuari que voleu signar\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "la classe de signatura és desconeguda"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aquesta ordre no està permesa mentre s'està en mode %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Heu de seleccionar al menys un ID d'usuari.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "No podeu esborrar l'últim ID d'usuari!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realment voleu eliminar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "no s'ha pogut obrir «%s»: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "error en crear l'anell «%s»: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Heu de seleccionar, si més no, una clau.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Realment voleu eliminar les claus seleccionades? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Realment voleu eliminar aquesta clau? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realment voleu revocar tots els ID d'usuari seleccionats? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realment voleu eliminar aquest ID d'usuari? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Realment voleu revocar les claus seleccionades? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Realment voleu revocar aquesta clau? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estableix la llista de preferències"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Voleu actualitzar les preferències per a les ID d'usuaris seleccionades?"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realment voleu actualitzar les preferències? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Voleu desar els canvis? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Voleu eixir sense desar? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "ha fallat l'actualització: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "ha fallat l'actualització de la clau secreta: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "La clau no ha canviat, per tant no cal actualització.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Resum: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Funcionalitats: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Notació: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hi ha preferències en un ID d'usuari d'estil PGP 2.x.\n"
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
 # Potser %s haja d'anar darrere de «clau».  ivb
 # És cert. Nova funcionalitat de 1.2.0, IIRC. jm
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aquesta clau pot ser revocada per la clau %s "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "no s'ha pogut creat %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr ""
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confiança: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Aquesta clau ha estat desactivada"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4190,19 +4200,19 @@ msgstr ""
 "Teniu en compte que la validesa de la clau mostrada no és necessàriament\n"
 "correcta a no ser que torneu a executar el programa.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada]"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4212,7 +4222,7 @@ msgstr ""
 "assumida.\n"
 
 # Photo ID com abans.  ivb
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4221,78 +4231,78 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP2. Afegir un photo ID pot fer que "
 "algunes versions de PGP rebutgen aquesta clau.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Esteu segur que encara voleu afegir-lo? (s/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No podeu afegir un photo ID a una clau d'estil PGP2.\n"
 
 # Aquesta i les següents no haurien de portar (s/N/q) i no (y/N/q)?  ivb
 # Hmm. Sí... (s/N/x) jm
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura correcta? (s/N/x)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura invàlida? (s/N/x)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Voleu esborrar aquesta signatura desconeguda? (s/N/x)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realment voleu esborrar aquesta autosignatura? (s/N)"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "S'ha esborrat %d signatura.\n"
 
 # Werner FIXME: use ngettext. jm
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "S'han esborrat %d signatures.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "No s'hi ha eliminat res.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "invàlida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'ID d'usuari «%s» està revocat."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4301,209 +4311,209 @@ msgstr ""
 "AVÍS: Aquesta és una clau d'estil PGP 2.x. Afegir un revocador designat pot\n"
 "fer que algunes versions de PGP rebutjen aquesta clau.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No podeu afegir un revocador designat a una clau d'estil PGP 2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduïu l'ID d'usuari del revocador designat: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "no es pot nominar a una clau d'estil PGP 2.x com a revocador designat\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "no podeu nominar una clau com el seu propi revocador designat\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Esteu segur que voleu nominar aquesta clau com a revocador designat? (s/N): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Per favor, elimineu les seleccions de les claus secretes.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Per favor, seleccioneu com a molt una clau secundària.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "S'està canviant la data de caducitat per a una clau secundària.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "S'està canviant la data de caducitat per a una clau primària.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No podeu canviar la data de caducitat de les claus v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "No hi ha cap signatura corresponent en l'anell secret\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVÍS: no es pot desfer la nominació d'una clau com a revocador designat!\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Heu de seleccionar exactament un ID.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "es descarta l'autosignatura v3 en l'id d'usuari «%s»\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Esteu segur que encara voleu utilitzarla (s/N)? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notació de signatura: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Voleu sobreescriure? (s/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "No hi ha cap ID amb l'índex %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID d'usuari: «"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 "»\n"
 "signat amb la vostra clau %08lX el %s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aquesta signatura va caducar el %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Esteu segur de que encara voleu revocarla? (s/N) "
 
 # (s/N) ivb
 # S! jm
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Voleu crear un certificat de revocació per a aquesta signatura? (s/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Heu signat els següents ID d'usuari:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (no-exportable)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocat per %08lX el %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Esteu a punt de revocar aquestes signatures:\n"
 
 # (s/N)?  ivb
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realment voleu crear els certificats de revocació? (s/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "ho hi ha clau secreta\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVÍS: una signatura d'ID d'usuari està datada %d segons en el futur\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'ID d'usuari «%s» ja està revocat\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5682,12 +5692,12 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "no es pot treballar amb l'algoritme de clau pública %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVÍS: la clau de sessió pot estar xifrada simètricament de forma insegura\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquet de tipus %d té el bit crític activat\n"
@@ -6094,28 +6104,28 @@ msgstr "les dades no s'han desat; useu l'opció \"--output\" per desar-les\n"
 
 # Indi? ivb
 # Em pense que no. jm
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Signatura separada.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Introduïu el nom del fitxer de dades: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "s'està llegint d'stdin...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "no hi ha dades signades\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "no s'han pogut obrir les dades signades `%s'\n"
diff --git a/po/cs.po b/po/cs.po
index 8ca756612..0ac15c747 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg2 2.0.11-r5164\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2009-09-29 15:47+0200\n"
 "Last-Translator: Petr Pisar <[email protected]>\n"
 "Language-Team: Czech <[email protected]>\n"
@@ -140,7 +140,7 @@ msgstr "nemohu vytvořit „%s“: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -356,7 +356,7 @@ msgstr "Prosím, pro ochranu svého nového klíče%0A zadejte heslo"
 msgid "Please enter the new passphrase"
 msgstr "Prosím, zadejte nové heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -365,102 +365,102 @@ msgstr ""
 "@Volby:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "běžet v režimu serveru (na popředí)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "běžen v režimu démona (na pozadí)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "s dodatečnými informacemi"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "být o trochu víc tichý"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "vypisovat příkazy ve stylu sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "vypisovat příkazy ve stylu csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|SOUBOR|načíst volby ze SOUBORU"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "neodpojovat se od konzole"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "neuzurpovat si klávesnici a myš"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "použít pro server soubor s protokolem"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "použít standardní umístění socketu"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PROGRAM|použít PROGRAM jako PIN-Entry program"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PROGRAM|použít PROGRAM jako SCdaemon program"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "nepoužívat SCdémona"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "ignorovat požadavky na změnu TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "ignorovat požadavky na změnu X displeje"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|zahodit zapamatované PINy po N sekundách"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "nepoužívat paměť PINů na podepisování"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "dovolit klientům označit klíče za „důvěryhodné“"
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "umožnit přednastavení hesla"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "zapnout emulaci ssh-agenta"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|SOUBOR|zapsat nastavení prostředí též do SOUBORU"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -469,11 +469,11 @@ msgstr ""
 "Chyby v programu, prosím, oznamujte (anglicky) na <@EMAIL@>,\n"
 "připomínky k překladu hlaste (česky) na <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Použití: gpg-agent [VOLBY] (-h pro nápovědu)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -481,144 +481,144 @@ msgstr ""
 "Syntaxe: gpg-agent [VOLBY] [PŘÍKAZ [ARGUMENTY]]\n"
 "Správa tajných klíčů pro GnuPG\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "zadána neplatná úroveň ladění „%s“\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s je příliš stará (potřebuji %s, mám %s)\n"
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "soubor s možnostmi „%s“: %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "čtu možnosti z „%s“\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nemohu vytvořit adresář „%s“: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "název socketu je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nemohu vytvořit socket: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "název socketu „%s“ je příliš dlouhý\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent již běží – nový nebude spuštěn\n"
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "chyba při získání náhodného řetězce pro socket\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba při přilepování socketu na „%s“: %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "služba listen() selhala: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "naslouchám na socketu „%s“\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "adresář „%s“ vytvořen\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() na „%s“ selhal: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "„%s“ nelze použít jako domovský adresář\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba při čtení náhodného řetězce z fd %d: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "obsluha 0x%lx pro fd %d spuštěna\n"
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "obsluha 0x%lx pro fd %d ukončena\n"
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "SSH obsluha 0x%lx pro fd %d spuštěna\n"
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "SSH obsluha 0x%lx pro fd %d ukončena\n"
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select selhala: %s – čekám 1 s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s pozastaveno\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr "v této relaci neběží žádný gpg-agent\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "špatný formát proměnné prostředí GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -828,7 +828,7 @@ msgstr "chyba při vytváření roury: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemohu otevřít (fdopen) rouru pro čtení: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba při rozdvojování procesu: %s\n"
@@ -843,7 +843,7 @@ msgstr "čekání na konec procesu %d se nezdařilo: %s\n"
 msgid "error getting exit code of process %d: %s\n"
 msgstr "chyba při získání návratového kódu procesu %d: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba v běhu „%s“: návratový kód %d\n"
@@ -853,7 +853,7 @@ msgstr "chyba v běhu „%s“: návratový kód %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "chyba při spouštění „%s“: pravděpodobně není nainstalován\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba v běhu „%s“: násilně ukončeno\n"
@@ -964,11 +964,16 @@ msgstr "při pokusu alokovat %lu bajtů došla bezpečná paměť"
 msgid "out of core while allocating %lu bytes"
 msgstr "při pokusu alokovat %lu bajtů došla paměť"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "gpg-agent neběží – spouštím jej\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "k agentu se nelze připojit – zkouším náhradní způsob\n"
 
@@ -1198,46 +1203,46 @@ msgstr "neočekávaný ASCII armor: "
 msgid "invalid dash escaped line: "
 msgstr "nesprávné označení řádku mínusy: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatný radix64 znak %02X byl přeskočen\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "předčasný konec souboru (žádné CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "předčasný konec souboru (žádné CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "špatný formát CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "předčasný konec souboru (v patičce)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "chyba v patičce\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenalezena žádná platná data ve formátu OpenPGP.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatné kódování ASCII: řádek je delší než %d znaků\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1282,7 +1287,7 @@ msgstr "OpenPGP karta není dostupná: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Nalezena OpenPGP karta číslo %s\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1551,7 +1556,7 @@ msgstr "tajný klíč je na kartě uložen\n"
 msgid "error writing key to card: %s\n"
 msgstr "chyba při zápisu klíče na kartu: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "ukončit toto menu"
 
@@ -1559,7 +1564,7 @@ msgstr "ukončit toto menu"
 msgid "show admin commands"
 msgstr "zobraz administrátorské příkazy"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "ukázat tuto pomoc"
 
@@ -1631,7 +1636,7 @@ msgstr "administrátorské příkazy jsou povoleny\n"
 msgid "Admin commands are not allowed\n"
 msgstr "administrátorské příkazy nejsou povoleny\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatný příkaz (zkuste „help“)\n"
 
@@ -1639,18 +1644,18 @@ msgstr "Neplatný příkaz (zkuste „help“)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pro tento příkaz není platný\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1928,7 +1933,7 @@ msgstr "Chybí otisk"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Neplatný klíč %s změněn na platný pomocí --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "neexistuje tajný podklíč pro veřejný klíč %s – ignorováno\n"
@@ -2159,7 +2164,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Veřejný klíč: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Šifra: "
 
@@ -2167,7 +2172,7 @@ msgstr "Šifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Komprese: "
 
@@ -2323,401 +2328,401 @@ msgstr "POZNÁMKA: starý implicitní soubor s možnostmi „%s“ ignorován\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt je příliš stará (potřebuji %s, mám %s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZNÁMKA: %s není pro normální použití!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "„%s“ není platná doba expirace podpisu\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "„%s“ není platná znaková sada\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "nelze zpracovat URL serveru klíčů\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "neplatný parametr pro server klíčů\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatný parametr pro import\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "neplatný parametr pro import\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatný parametr pro export\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "neplatný parametr pro export\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "neplatný parametr pro výpis\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "zobrazovat ID fotografií při ověřování podpisu"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "ukazovat URL politik při ověřování podpisu"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "ukazovat všechny poznámky při ověřování podpisu"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "ukazovat poznámky IETF standardu při ověřování podpisu"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "ukazovat uživatelské poznámky při ověřování podpisu"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "ukazovat URL upřednostňovaného serveru klíčů při ověřování podpisu"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "ukazovat platnost ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "ukazovat odvolané a prošlé ID uživatelů při ověřování podpisů"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "ukazovat jen primární ID uživatele při ověřování podpisu"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "ověřovat podpisy s daty PKA"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "vyzvednout důvěru podpisů s platnými daty PKA"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "neplatný parametr pro ověření\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nelze nastavit exec-path na %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "neplatný seznam auto-key-locate\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVÁNÍ: program může vytvořit soubor core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVÁNÍ: %s přepíše %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Není dovoleno používat %s s %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nedává s %s smysl!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nelze spustit s nebezpečnou pamětí vzhledem k %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v módu --pgp2 můžete vytvářet pouze oddělené podpisy nebo podpisy čitelné "
 "jako text\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v módu --pgp2 nelze současně šifrovat a podepisovat\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v módu --pgp2 musíte použít soubor (ne rouru).\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "šifrování zpráv v módu --pgp2 vyžaduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybraný šifrovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybraný kompresní algoritmus je neplatný\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybraný hashovací algoritmus je neplatný\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "položka completes-needed musí být větší než 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "položka marginals-needed musí být větší než 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "položka max-cert-depth musí být v rozmezí od 1 do 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "neplatná implicitní úroveň certifikace (default-cert-level); musí být 0, 1, "
 "2 nebo 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "neplatná minimální úroveň certifikace (min-cert-level); musí být 0, 1, 2 "
 "nebo 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZNÁMKA: jednoduchý mód S2K (0) je důrazně nedoporučován\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatný mód S2K; musí být 0, 1 nebo 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "neplatné implicitní předvolby\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatné uživatelské předvolby pro šifrování\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "neplatné uživatelské předvolby pro hashování\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "neplatné uživatelské předvolby pro komprimaci\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s dosud není funkční s %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "použití šifrovacího algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "použití hashovacího algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "použití komprimačního algoritmu „%s“ v módu %s dovoleno\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nemohu inicializovat databázi důvěry: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVÁNÍ: specifikován adresát (-r) bez použití šifrování s veřejným klíčem\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [jméno souboru]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [jméno souboru]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symetrické šifrování „%s“ se nepovedlo: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [jméno souboru]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nelze použít --symmetric --encrypt v módu %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [jméno souboru]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [jméno souboru]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nelze použít --symmetric --sign --encrypt s příkazem --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nelze použít --symmetric --sign --encrypt v módu %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [jméno souboru]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [jméno souboru]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [jméno souboru]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id uživatele"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id uživatele"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id uživatele [příkazy]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id uživatele"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "odeslání na keyserver se nezdařilo: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "získání dat z serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export klíče se nepodařil: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "hledání na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "obnovení dat na serveru klíčů se nezdařilo: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dekódování z ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "kódování do ASCII formátu selhalo: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatný hashovací algoritmus „%s“\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[jméno souboru]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Začněte psát svou zprávu ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadané URL pro certifikační politiku je neplatné\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadané URL pro podepisovací politiku je neplatné\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadané URL preferovaného serveru klíčů je neplatné\n"
 
@@ -2867,7 +2872,7 @@ msgstr "         odstraněné podpisy: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr " odstraněné uživatelské ID: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2876,327 +2881,332 @@ msgstr ""
 "VAROVÁNÍ: klíč %s obsahuje předvolby pro nedostupné\n"
 "algoritmy na těchto ID uživatelů:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": předvolby pro šifrovací algoritmus %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": předvolby pro podepisovací algoritmus %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": předvolby pro komprimační algoritmus %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "velmi doporučujeme aktualizaci nastavení vašich preferencí a\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "distribuci tohoto klíče aby jste předešel problémům s neshodou algoritmů\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "nelze aktualizovat předvolby s: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klíč %s: chybí identifikátor uživatele\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klíč %s: PKS poškození podklíče opraveno\n"
 
 # c-format
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klíč %s: přijat id uživatele \"%s\",který není podepsán jím samým\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klíč %s: chybí platný identifikátor uživatele\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "může to být způsobeno chybějícím podpisem klíče jím samým\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klíč %s: veřejný klíč nenalezen: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klíč %s: nový klíč - přeskočen\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nenalezen zapisovatelný soubor klíčů (keyring): %s\n"
 
 # g10/import.c:766 g10/openfile.c:261#, c-format
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisuji do „%s“\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba při zápisu souboru klíčů (keyring) „%s“: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klíč %s: veřejný klíč „%s“ importován\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klíč %s: neodpovídá naší kopii\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klíč %s: nemohu najít originální blok klíče: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klíč %s: nemohu číst originální blok klíče: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klíč %s: „%s“ 1 nový identifikátor uživatele\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klíč %s: „%s“ %d nových identifikátorů uživatele\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klíč %s: „%s“ 1 nový podpis\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klíč %s: „%s“ %d nových podpisů\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klíč %s: „%s“ 1 nový podklíč\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klíč %s: „%s“ %d nových podklíčů\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klíč %s: „%s“ %d podpisů odstraněno\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klíč %s: „%s“ %d ID uživatele odstraněno\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klíč %s: „%s“ beze změn\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klíč %s: tajný klíč s neplatnou šifrou %d – přeskočeno\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "import tajných klíčů není povolen\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "není nastaven implicitní soubor tajných klíčů %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klíč %s: tajný klíč importován\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "klíč %s: je již v souboru tajných klíčů\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klíč %s: nenalezen tajný klíč: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "klíč %s: chybí veřejný klíč – nemohu aplikovat revokační certifikát\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klíč %s: neplatný revokační certifikát: %s – zamítnuto\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klíč %s: „%s“ revokační certifikát importován\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klíč %s: neexistuje id uživatele pro podpis\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "klíč %s: nepodporovaný algoritmus veřejného klíče u uživatelského ID „%s“\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klíč %s neplatný podpis klíče jím samým u uživatelského ID „%s“\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klíč %s: nepodporovaný algoritmus veřejného klíče\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "klíč %s: neexistuje podklíč pro vázání klíčů\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klíč %s: neplatná vazba podklíče\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klíč %s: smazána vícenásobná vazba podklíče\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klíč %s: neexistuje podklíč pro revokaci klíče\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klíč %s: neplatný revokační podklíč\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klíč %s: smazána vícenásobná revokace podklíče\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klíč %s: přeskočen identifikátor uživatele „%s“\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klíč %s: podklíč přeskočen\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klíč %s: podpis není exportovatelný (třída %02X) - přeskočeno\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "klíč %s: revokační certifikát na špatném místě - přeskočeno \n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klíč %s: neplatný revokační certifikát: %s - přeskočen\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klíč %s: podpis podklíče na špatném místě - přeskočeno \n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klíč %s: neočekávaná podpisová třída (0x%02X) - přeskočeno\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "klíč %s: objeven duplikovaný identifikátor uživatele - sloučen\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVÁNÍ: klíč %s může být revokován: zkouším získat revokační klíč %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VAROVÁNÍ: klíč %s může být revokován: revokační klíč %s nenalezen.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klíč %s: „%s“ přidán revokační certifikát\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klíč %s: podpis klíče jím samým (direct key signature) přidán\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "POZNÁMKA: sériové číslo klíče neodpovídá číslu karty\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "POZNÁMKA: primární klíč je online a je uložen na kartě\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "POZNÁMKA: sekundární klíč je online a je uložen na kartě\n"
 
@@ -3308,12 +3318,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Uživatelské ID „%s“ je revokováno."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Jste si jistý(á), že stále chcete podepsat tento klíč? (a/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Nelze podepsat.\n"
 
@@ -3499,8 +3509,8 @@ msgstr "Velmi pečlivě jsem ověřil tento klíč.\n"
 msgid "Really sign? (y/N) "
 msgstr "Skutečně podepsat? (a/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podepsání selhalo: %s\n"
@@ -3556,181 +3566,181 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Opravdu to chcete udělat? (a/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "přesunuji podpis klíče na správné místo\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "uložit a ukončit"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "vypsat otisk klíče"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "vypsat seznam klíčů a id uživatelů"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "vyberte identifikátor uživatele N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "vyberte podklíč N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "kontrolovat podpisy"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "podepsat vybrané ID uživatele [* níže jsou uvedeny relevantní příkazy]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "podepsat vybrané uživatelské ID lokálně"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "podepsat vybrané uživatelské ID důvěryhodným podpisem"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "podepsat vybraná uživatelská ID neodvolatelným podpisem"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "přidat identifikátor uživatele"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "přidat fotografický ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "smazat vybrané ID uživatele"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "přidat podklíč"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "přidat klíč na kartu"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "přesunout klíč na kartu"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "přesunout záložní klíč na kartu"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "smazat vybrané podklíče"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "přidat revokační klíč"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "smazat podpisy z vybraných uživatelských ID"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "změnit datum expirace pro klíč nebo vybrané podklíče"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "označit vybrané uživatelské ID jako primární"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "přepnout mezi výpisem seznamu tajných a veřejných klíčů"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "vypsat seznam předvoleb (pro experty)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "vypsat seznam předvoleb (podrobně)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "nastavit sadu preferencí pro vybrané uživatelské ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nastavit URL preferovaného serveru klíčů pro vybraná uživatelská ID"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "zadat poznámku pro vybraná uživatelská ID"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "změnit heslo"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "změnit důvěryhodnost vlastníka klíče"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "revokovat podpisu na vybraných uživatelských ID"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "revokovat vybrané uživatelské ID"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "revokovat klíč nebo vybrané podklíče"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "nastavit klíč jako platný (enable)"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "nastavit klíč jako neplatný (disable)"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "ukázat vybrané fotografické ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "směstnat nepoužitelná ID uživatelů a odstranit z klíče nepoužitelné podpisy"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "směstnat nepoužitelná ID uživatelů a odstranit z klíče všechny podpisy"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba při čtení bloku tajného klíče „%s“: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Tajný klíč je dostupný.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Pro provedení této operace je potřeba tajný klíč.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Prosím, nejdříve použijte příkaz „toggle“ (přepnout).\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3741,225 +3751,225 @@ msgstr ""
 "  s prefixem „t“ pro důvěryhodný podpis (tsign) nebo „nr“ pro neodvolatelný\n"
 "  podpis (nrsign) nebo libovolnou jejich kombinací (ltsign, tnrsign, atd.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Klíč revokován."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Opravdu podepsat všechny id uživatele? (a/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Nápověda: Vyberte id uživatele k podepsání\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Neznámý typ podpisu „%s“\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento příkaz není v módů %s dovolený.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Musíte vybrat alespoň jeden id uživatele.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Nemůžete smazat poslední id uživatele!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Opravdu odstranit všechny vybrané id uživatele? (a/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Opravdu odstranit tento id uživatele? (a/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Opravdu přesunout primární klíč? (a/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Musíte vybrat právě jeden klíč.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Příkaz očekává jméno souboru jako argument\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nemohu otevřít „%s“: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Chyba při čtení záložního klíče z „%s“: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Musíte vybrat alespoň jeden klíč.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Opravdu chcete smazat vybrané klíče? (a/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Opravdu chcete smazat tento klíč? (a/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Opravdu revokovat všechny vybrané id uživatele? (a/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Opravdu revokovat tento id uživatele? (a/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Opravdu chcete revokovat celý klíč? (a/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Opravdu chcete revokovat vybrané podklíče? (a/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Opravdu chcete revokovat tento podklíč? (a/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Důvěryhodnost vlastníka nelze měnit je-li používána databáze důvěry "
 "poskytnutá uživatelem\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Nastavit seznam předvoleb:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Opravdu aktualizovat předvolby pro vybraný id uživatele? (a/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Opravdu aktualizovat předvolby? (a/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Uložit změny? (a/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Ukončit bez uložení? (a/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualizace selhala: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualizace tajného klíče selhala: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Klíč nebyl změněn, takže není potřeba jej aktualizovat.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Hash: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Vlastnosti: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Keyserver bez modifikace"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Preferovaný keyserver: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Poznámky: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Uživatelský ID formátu PGP 2.x nemá žádné předvolby\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "V %s tento klíč revokoval %s klíčem %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento klíč může být revokován %s klíčem %s "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(citlivá informace)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "vytvořen: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revokován: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "platnost skončila: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "platnost skončí: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "použití: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "důvěra: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "platnost: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Tento klíč byl označen za neplatný (disabled)"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "číslo karty: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3967,17 +3977,17 @@ msgstr ""
 "Prosím nezapomeňte, že zobrazované údaje o platnosti klíčů nemusí\n"
 "být nutně správné, dokud znova nespustíte program.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revokován"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "platnost skončila"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3985,7 +3995,7 @@ msgstr ""
 "VAROVÁNÍ: žádné uživatelské ID nebylo označeno jako primární.  Tento příkaz\n"
 "              může způsobit, že za primární bude považováno jiné user ID.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3994,74 +4004,74 @@ msgstr ""
 "VAROVÁNÍ: Toto je PGP2 klíč. Přidání fotografického ID může v některých\n"
 "         verzích PGP vést k odmítnutí tohoto klíče.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Jste si jistý, že jej chcete stále přidat? (a/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Neměli by jste přidávat fotografický ID k PGP2 klíči.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Smazat tento dobrý podpis? (a/N/u)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Smazat tento neplatný podpis? (a/N/u)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Smazat tento neznámý podpis? (a/N/u)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Opravdu smazat tento podpis podepsaný sebou samým? (a/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Smazán %d podpis.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Smazáno %d podpisů.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nic nebylo smazáno.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "neplatný"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uživatelské ID „%s“ směstnáno: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uživatelské ID „%s“: %d podpisů odstraněno\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uživatelské ID „%s“: je již minimalizované\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uživatelské ID „%s“: je již odstraněné\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4070,192 +4080,192 @@ msgstr ""
 "VAROVÁNÍ: Toto je PGP2 klíč. Přidání 'pověření revokace' může v některých\n"
 "          verzích PGP vést k odmítnutí tohoto klíče.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Neměli by jste přidávat 'pověření revokace' k PGP2 klíči.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vložte identifikátor uživatele pověřeného revokací: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klíč formátu PGP 2.x nelze pověřit revokací\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "klíč nelze pověřit revokací jím samým\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "tento klíč již byl pověřen revokací\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "VAROVÁNÍ: ustanovení klíče „pověřeným odvolatelem“ je nevratná operace!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Jste si jistí, že tento klíč chcete pověřit revokací? (a/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosím, odstraňte výběr z tajných klíčů.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Prosím, vyberte nejvýše jeden podklíč.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Měním dobu expirace podklíče.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Měním dobu expirace primárního klíče.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nemůžete změnit dobu platnosti klíče verze 3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "V souboru tajných klíčů chybí odpovídající podpis\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podepisovací podklíč %s je již křížově certifikován\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "podklíč %s nepodepisuje, a tak není třeba jej křížově certifikovat\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosím, vyberte právě jeden id uživatele .\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "přeskočen v3 podpis klíče jím samým u uživatelského id „%s“\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Vložte URL preferovaného serveru klíčů: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete přepsat? (a/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Jste si jistý(á), že jej chcete smazat? (a/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Vložte poznámku: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "Pokračovat (a/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifikátor uživatele s indexem %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje uživatelské ID s hashem %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje podklíč s indexem %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID uživatele: „%s“\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podepsáno vaším klíčem %s v %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (neexportovatelné)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnost podpisu vyprší %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Jste si jistý, že jej chcete stále revokovat? (a/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvořit pro tento podpis revokační certifikát? (a/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr "Nepodepsáno vámi.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podepsal(a) jste následující identifikátory uživatele: %s:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (neodvolatelné)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revokováno vaším klíčem %s v %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chystáte se revokovat tyto podpisy:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Opravdu vytvořit revokační certifikáty? (a/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "neexistuje tajný klíč\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "uživatelské ID „%s“ je již revokováno\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVÁNÍ: podpis ID uživatele je datován %d sekund v budoucnosti\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klíč %s je již revokován.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklíč %s je již revokován.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Zobrazuji %s fotografický ID o velikosti %ld pro klíč %s (uid %d)\n"
@@ -5396,11 +5406,11 @@ msgstr "VAROVÁNÍ: nastavení z „%s“ nejsou při tomto spuštění zatím a
 msgid "can't handle public key algorithm %d\n"
 msgstr "nemohu pracovat s algoritmem veřejného klíče %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROVÁNÍ: potencionálně nebezpečně symetricky zašifrován klíč sezení\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpacket typu %d má nastavený kritický bit\n"
@@ -5779,28 +5789,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "data nebyla uložena; k jejich uložení použijte parametr příkazu „--output“\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Podpis oddělený od dokumentu.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Prosím, vložte název datového souboru: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "čtu standardní vstup…\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "chybí podepsaná data\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nemohu otevřít podepsaná data „%s“\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nemohu otevřít podepsaná data na fd=%d: %s\n"
diff --git a/po/da.po b/po/da.po
index 5b3e54014..423a75fe6 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.0h\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2003-12-03 16:11+0100\n"
 "Last-Translator: Birger Langkjer <[email protected]>\n"
 "Language-Team: Danish <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "kan ikke oprette %s: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -329,7 +329,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -340,107 +340,107 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "meddelsom"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "v�r mere stille"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|indl�s udvidelsesmodul FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "eksport�r n�gler til en n�gletjener"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "opdat�r tillidsdatabasen"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -448,156 +448,156 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapport�r venligst fejl til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Brug: gpg [flag] [filer] (-h for hj�lp)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "alternativfil`%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "l�ser indstillinger fra `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "certifikatl�seproblem: %s\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: mappe oprettet\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kan ikke oprette mappe: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, 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:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: udelod: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -801,7 +801,7 @@ msgstr "fejl ved oprettelse af kodes�tning: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -816,7 +816,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -826,7 +826,7 @@ msgstr "fejl ved l�sning af '%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
@@ -937,11 +937,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1191,47 +1196,47 @@ msgstr "uforventet beskyttelse:"
 msgid "invalid dash escaped line: "
 msgstr ""
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ugyldigt radix64 tegn %02x udeladt\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "d�rlig CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC fejl; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "fejl i trailerlinie\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP data fundet.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldigt panser: linie l�ngere end %d tegn\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "quoted printable-tegn i panser - m�ske pga. en fejlbeh�ftet MTA\n"
@@ -1275,7 +1280,7 @@ msgstr "hemmelig n�gle ikke tilg�ngelig"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr ""
@@ -1559,7 +1564,7 @@ msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 msgid "error writing key to card: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "afslut denne menu"
 
@@ -1568,7 +1573,7 @@ msgstr "afslut denne menu"
 msgid "show admin commands"
 msgstr "konfliktende kommandoer\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "vis denne hj�lp"
 
@@ -1648,7 +1653,7 @@ msgstr "konfliktende kommandoer\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr ""
 
@@ -1656,18 +1661,18 @@ msgstr ""
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1942,7 +1947,7 @@ msgstr "Fingeraftryk:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2187,7 +2192,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr ""
 
@@ -2195,7 +2200,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 #, fuzzy
 msgid "Compression: "
 msgstr "Kommentar: "
@@ -2336,418 +2341,418 @@ msgstr "NOTITS: ingen standard alternativfil '%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTITS: %s er ikke til normal brug!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "import�r n�gler fra en n�gleserver: %s\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "ugyldig rustning"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s er ikke et gyldigt tegns�t\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "ugyldig n�glering"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "ADVARSEL: '%s' er en tom fil\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr ""
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ikke tilladt med %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgte resum�algoritme er ugyldig\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr ""
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr ""
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr ""
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: simpel S2K modus (0) frar�des p� det skarpeste\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K modus; skal v�re 0, 1 el. 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "vis pr�ferencer"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s er meningsl�s sammen med %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "valgte cifferalgoritme er ugyldig\n"
 
 # er det klogt at overs�tte TrustDB?
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "kunne ikke initialisere TillidsDB: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [filnavn (som gemmes)]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn (som krypteres)]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [filnavn (som signeres)]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn (som dekrypteres)]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key bruger-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key bruger-id [kommandoer]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key bruger-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "signering fejlede: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr ""
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "fjernelse af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "p�kl�dning af beskyttelse fejlede: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hash-algoritme `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "G� til sagen og skriv meddelelsen ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den givne politik-URL er ugyldig\n"
@@ -2901,331 +2906,336 @@ msgstr "        nye signaturer: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr " hemmelige n�gler l�st: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signatur fra: %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr ""
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�gle %08lX: stemmer ikke med vores kopi\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke lokalisere original n�gleblok: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�gle %08lX: kan ikke l�se original n�gleblok: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skriver hemmeligt certifikat til '%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard offentlig n�glering\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "hemmelige n�gler import: %lu\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "fjern n�gle fra den hemmelige n�glering"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%s: bruger ikke fundet: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�gle %08lX: ingen bruger-id\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�gle %08lX: offentlig n�gle ikke fundet: %s\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "n�gle %08lX: offentlig n�gle importeret\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�gle %08lX: undern�gle er blevet annulleret!\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%s: udelod: %s\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�gle %08lX: ikke en rfc2440 n�gle - udeladt\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�gle %08lX: offentlig n�gle importeret\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "udelod: hemmelig n�gle er allerede tilstede\n"
@@ -3329,13 +3339,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "N�glen er beskyttet.\n"
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3513,8 +3523,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering fejlede: %s\n"
@@ -3568,200 +3578,200 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr ""
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "gem og afslut"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vis fingeraftryk"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "vis n�gler og bruger-id'er"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr ""
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "v�lg sekund�r n�gle N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "Kan ikke tjekke signatur: %s\n"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr ""
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "add a photo ID"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "slet bruger id"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "slet sekund�r n�gle"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "add a revocation key"
 msgstr "tilf�j sekund�r n�gle"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "skift imellem hemmelig og offentlig n�gle visning"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "�ndr kodes�tningen"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr ""
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "tilf�j bruger-id"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "sl� n�gle til"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "sl� n�gle fra"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fejl ved l�sning af '%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr ""
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr ""
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3769,173 +3779,173 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 #, fuzzy
 msgid "Key is revoked."
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Vil du gerne signere? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 #, fuzzy
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "sign�r n�glen lokalt"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ukendt signaturklasse"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr ""
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "kan ikke �bne '%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "fejl ved skrivning af n�glering `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr ""
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Vil du virkelig oprette?"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du gerne oprette en underskrivnings- og krypteringsn�gle? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig gerne g�re dette?"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "vis pr�ferencer"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gem �ndringer? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Afslut uden at gemme? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr ""
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr ""
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3943,374 +3953,374 @@ msgstr ""
 "Indstillinger:\n"
 " "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "kan ikke oprette %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "N�gle udl�ber d. %s\n"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "betro"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr ""
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "tilf�j n�gle"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "udl�b"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettede %d signatur.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr ""
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr ""
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "ugyldig rustning"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Indtast n�glens st�rrelse"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "V�lg venligst hvilken slags n�gle du vil have:\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "n�gle %08lX: ingen gyldige bruger-id'er\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Overskriv (j/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen bruger-id med indeks %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "bruger-id: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne n�gle er ikke beskyttet.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Er du sikker p� at de vil benytte denne n�glest�rrelse? "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "sign�r en n�gle lokalt"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "ADVARSEL: Denne n�gle er blevet annulleret af dets ejer!\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Gener�r en annull�rbar certifikat"
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr ""
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "N�glen er beskyttet.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5438,11 +5448,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5826,28 +5836,28 @@ msgstr "n�gle %08lX: ingen bruger-id\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "l�ser stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke �bne %s: %s\n"
diff --git a/po/de.po b/po/de.po
index fbe773310..e9f2cfe5c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gnupg-2.0.14\n"
+"Project-Id-Version: gnupg-2.0.16\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:41+0100\n"
-"PO-Revision-Date: 2010-04-22 15:24+0200\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
+"PO-Revision-Date: 2010-07-19 09:00+0200\n"
 "Last-Translator: Werner Koch <[email protected]>\n"
 "Language-Team: German <[email protected]>\n"
 "MIME-Version: 1.0\n"
@@ -125,7 +125,7 @@ msgstr "'%s' kann nicht erzeugt werden: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -340,7 +340,7 @@ msgstr "Bitte geben Sie die Passphrase ein,%0Aum Ihren Schlüssel zu schützen."
 msgid "Please enter the new passphrase"
 msgstr "Bitte geben Sie die Passphrase ein:"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -349,102 +349,102 @@ msgstr ""
 "@Optionen:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "Im Server Modus ausführen"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "Im Daemon Modus ausführen"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "Detaillierte Informationen"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "Reduzierte Informationen"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "Ausgabe für /bin/sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "Ausgabe für /bin/csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|DATEI|Konfigurationsoptionen aus DATEI lesen"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "Im Vordergrund laufen lassen"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "Tastatur und Maus nicht \"grabben\""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "Logausgaben in eine Datei umlenken"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "Benutze einen Standardnamen für den Socket"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|benutze PGM as PIN-Entry"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|benutze PGM als SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "Den Scdaemon-basierten Kartenzugriff nicht nutzen"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "Ignoriere Anfragen, das TTY zu wechseln"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "Ignoriere Anfragen, das X-Display zu wechseln"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|lasse PINs im Cache nach N Sekunden verfallen"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "benutze PINs im Cache nicht beim Signieren"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "erlaube Aufrufern Schlüssel als \"vertrauenswürdig\" zu markieren"
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "erlaube ein \"preset\" von Passphrases"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "Die ssh-agent-Emulation anschalten"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DATEI|Schreibe die Umgebungsvariablen auf DATEI"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -453,11 +453,11 @@ msgstr ""
 "Berichte über Programmfehler bitte in englisch an <@EMAIL@>.\n"
 "Sinn- oder Schreibfehler in den deutschen Texten bitte an <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Aufruf: gpg-agent [Optionen] (-h für Hilfe)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -465,144 +465,144 @@ msgstr ""
 "Syntax: gpg-agent [Optionen] [Befehl [Argumente]]\n"
 "Verwaltung von geheimen Schlüsseln für GnuPG\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ungültige Debugebene `%s' angegeben\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "Hinweis: Keine voreingestellte Optionendatei '%s' vorhanden\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "Optionendatei '%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Optionen werden aus '%s' gelesen\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "Verzeichnis `%s' kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "Der Name des Sockets ist zu lang\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "Socket kann nicht erzeugt werden: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Der Name des Sockets `%s' ist zu lang\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "Fehler beim Ermitteln der \"Nonce\" dieses Sockets\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, 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:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "Der listen()-Aufruf ist fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "Es wird auf Socket `%s' gehört\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "Verzeichnis `%s' erzeugt\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat()-Aufruf für `%s' fehlgeschlagen: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, 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:1781
+#: agent/gpg-agent.c:1786
 #, 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:1786
+#: agent/gpg-agent.c:1791
 #, 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:1806
+#: agent/gpg-agent.c:1811
 #, 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:1811
+#: agent/gpg-agent.c:1816
 #, 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:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select()-Aufruf fehlgeschlagen: %s - warte 1s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s angehalten\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "fehlerhaft aufgebaute GPG_AGENT_INFO - Umgebungsvariable\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -821,7 +821,7 @@ msgstr "Fehler beim Erzeugen einer \"Pipe\": %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Pipe kann nicht zum Lesen \"fdopen\"t werden: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "Fehler beim \"Forken\" des Prozess: %s\n"
@@ -836,7 +836,7 @@ msgstr "Das Warten auf die Beendigung des Prozesses %d schlug fehl: %s\n"
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Fehler beim Holen des Exitwerte des Prozesses %d: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
@@ -846,7 +846,7 @@ msgstr "Fehler bei Ausführung von `%s': Endestatus %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "Fehler bei Ausführung von `%s': wahrscheinlich nicht installiert\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Fehler bei Ausführung von `%s': beendet\n"
@@ -956,11 +956,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr "Kein Speicher mehr vorhanden, als %lu Byte zugewiesen werden sollten"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "Kein aktiver gpg-agent - es wird einer gestartet\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr "Warte %d Sekunden bis der gpg-agent bereit ist\n"
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "Verbindung zum gpg-agent nicht möglich - Ersatzmethode wird versucht\n"
 
@@ -1184,46 +1189,46 @@ msgstr "Unerwartete ASCII-Hülle: "
 msgid "invalid dash escaped line: "
 msgstr "Ungültige mit Bindestrich \"escapte\" Zeile: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Ungültiges \"radix64\" Zeichen %02x übersprungen\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "vorzeitiges Dateiende (keine Prüfsumme)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "vorzeitiges Dateiende (innerhalb der Prüfsumme)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "Falsch aufgebaute Prüfsumme\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Prüfsummenfehler; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "vorzeitiges Dateiende (im Nachsatz)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "Fehler in der Nachsatzzeile\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "Keine gültigen OpenPGP-Daten gefunden.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ungültige ASCII-Hülle: Zeile ist länger als %d Zeichen\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1268,7 +1273,7 @@ msgstr "OpenPGP Karte ist nicht vorhanden: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP Karte Nr. %s erkannt\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1543,7 +1548,7 @@ msgstr "Geheimer Schlüssel ist bereits auf einer Karte gespeichert\n"
 msgid "error writing key to card: %s\n"
 msgstr "Fehler beim Schreiben des Schlüssels auf die Karte: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "Menü verlassen"
 
@@ -1551,7 +1556,7 @@ msgstr "Menü verlassen"
 msgid "show admin commands"
 msgstr "Zeige Admin-Befehle"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "Diese Hilfe zeigen"
 
@@ -1623,7 +1628,7 @@ msgstr "Admin-Befehle sind erlaubt\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-Befehle sind nicht erlaubt\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ungültiger Befehl (versuchen Sie's mal mit \"help\")\n"
 
@@ -1631,18 +1636,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1933,7 +1938,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ungültiger Schlüssel %s, gültig gemacht per --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2169,7 +2174,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Öff. Schlüssel: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Verschlü.: "
 
@@ -2177,7 +2182,7 @@ msgstr "Verschlü.: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Komprimierung: "
 
@@ -2328,409 +2333,409 @@ msgstr ""
 "Die Bibliothek \"libgcrypt\" ist zu alt (benötigt wird %s, vorhanden ist %"
 "s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "Hinweis: %s ist nicht für den üblichen Gebrauch gedacht!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' ist kein gültiges Signaturablaufdatum\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' ist kein gültiger Zeichensatz\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "Schlüsselserver-URL konnte nicht analysiert werden\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "Ungültige Schlüsselserver-Option\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ungültige Import-Option\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "Ungültige Import-Option\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ungültige Export-Option.\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "Ungültige Export-Option\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ungültige Listen-Option.\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "Ungültige Listen-Option\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "Foto-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "Richtlinien-URLs während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "Alle Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "Standard-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "Benutzer-Notationen während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "Die URL für den bevorzugten Schlüsselserver während der Signaturprüfung "
 "anzeigen"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "Die Gültigkeit der User-ID während der Signaturprüfung anzeigen"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "Zeige widerrufene und verfallene User-IDs während der Signaturprüfung"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "Zeige nur die Haupt-User-ID während der Signaturprüfung"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "Prüfe Signaturgültigkeit mittels PKA-Daten"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "Werte das Vertrauen zu Signaturen durch gültige PKA-Daten auf"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ungültige Überprüfungs-Option.\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "Ungültige Überprüfungs-Option\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Der Ausführungspfad konnte nicht auf %s gesetzt werden.\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "ungültige \"auto-key-locate\"-Liste\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "WARNUNG: Programm könnte eine core-dump-Datei schreiben!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "WARNUNG: %s ersetzt %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s kann nicht zusammen mit %s verwendet werden!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s zusammen mit %s ist nicht sinnvoll!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "Startet nicht mit unsicherem Speicher, wegen Option %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nur abgetrennte oder Klartextsignaturen machen\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "Im --pgp2-Modus können Sie nicht gleichzeitig signieren und verschlüsseln\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "Im --pgp2-Modus müssen Sie Dateien benutzen und können keine Pipes "
 "verwenden.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "Verschlüsseln einer Botschaft benötigt im --pgp2-Modus die IDEA-"
 "Verschlüsselung\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "Das ausgewählte Verschlüsselungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "Das ausgewählte Komprimierungsverfahren ist ungültig\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Das ausgewählte Hashverfahren ist ungültig\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed müssen größer als 0 sein\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed müssen größer als 1 sein\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth muß im Bereich 1 bis 255 liegen\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ungültiger \"default-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ungültiger \"min-cert-level\"; Wert muß 0, 1, 2 oder 3 sein\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "Hinweis: Vom \"simple S2K\"-Modus (0) ist strikt abzuraten\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ungültiger \"simple S2K\"-Modus; Wert muß 0, 1 oder 3 sein\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "ungültige Standard-Voreinstellungen\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "ungültige private Verschlüsselungsvoreinstellungen\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "ungültige private Hashvoreinstellungen\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "ungültige private Komprimierungsvoreinstellungen\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s arbeitet noch nicht mit %s zusammen\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Verschlüsselungsverfahren %s ist im %s-Modus nicht "
 "erlaubt.\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Die Benutzung der Hashmethode %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "Die Benutzung des Komprimierverfahren %s ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Die Trust-DB kann nicht initialisiert werden: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "WARNUNG: Empfänger (-r) angegeben ohne Verwendung von Public-Key-Verfahren\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [Dateiname]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [Dateiname]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Symmetrische Entschlüsselung von `%s' fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [Dateiname]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [Dateiname]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet werden\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Im %s-Modus kann --symmetric --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [Dateiname]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [Dateiname]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "--symmetric --sign --encrypt kann nicht zusammen mit --s2k-mode 0 verwendet "
 "werden\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "Im %s-Modus kann --symmetric --sign --encrypt nicht verwendet werden.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [Dateiname]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [Dateiname]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [Dateiname]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key User-ID"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key User-ID"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key User-ID [Befehle]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 msgid "--passwd <user-id>"
 msgstr "--passwd User-ID"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Senden an Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Empfangen vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Schlüsselexport fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Suche auf dem Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh vom Schlüsselserver fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "Entfernen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "Anbringen der ASCII-Hülle ist fehlgeschlagen: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "Ungültiges Hashverfahren '%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[Dateiname]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Auf geht's - Botschaft eintippen ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "Die angegebene Zertifikat-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "Die angegebene Signatur-Richtlinien-URL ist ungültig\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "Die angegebene URL des bevorzugten Schlüsselserver ist ungültig\n"
 
@@ -2881,7 +2886,7 @@ msgstr "    Signaturen bereinigt: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      User-IDs bereinigt: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2890,338 +2895,343 @@ msgstr ""
 "WARNUNG: Schlüssel %s hat Einstellungen zu nicht verfügbaren\n"
 "Verfahren für folgende User-ID:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": Einstellungen des Verschlüsselungsverfahren %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": Einstellungen der Hashmethode %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": Einstellungen der Komprimierungsverfahren %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "es ist extrem empfehlenswert Ihre Einstellungen zu ändern und\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "diesen Schlüssel wieder zu verteilen, um mögliche Probleme durch unpassende "
 "Verfahrenskombinationen zu vermeiden\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "Sie können Ihren Einstellungen mittels \"gpg --edit-key %s updpref save\" "
 "ändern\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "Schlüssel %s: Keine User-ID\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "Schlüssel %s: PKS Unterschlüsseldefekt repariert\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "Schlüssel %s: Nicht eigenbeglaubigte User-ID `%s' übernommen\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "Schlüssel %s: Keine gültigen User-IDs\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dies könnte durch fehlende Eigenbeglaubigung verursacht worden sein\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "Schlüssel %s: neuer Schlüssel - übersprungen\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kein schreibbarer Schlüsselbund gefunden: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "Schreiben nach '%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Fehler beim Schreiben des Schlüsselbundes `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "Schlüssel %s: Öffentlicher Schlüssel \"%s\" importiert\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "Schlüssel %s: Stimmt nicht mit unserer Kopie überein\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "Schlüssel %s: der originale Schlüsselblock wurde nicht gefunden: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "Schlüssel %s: Lesefehler im originalen Schlüsselblock: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue User-ID\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "Schlüssel %s: \"%s\" %d neue User-IDs\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "Schlüssel %s: \"%s\" 1 neue Signatur\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Signaturen\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "Schlüssel %s: \"%s\" 1 neuer Unterschlüssel\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "Schlüssel %s: \"%s\" %d neue Unterschlüssel\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d Signaturen bereinigt\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-ID bereinigt\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "Schlüssel %s: \"%s\" %d User-IDs bereinigt\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "Schlüssel %s: \"%s\" nicht geändert\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "Schlüssel %s: geheimer Schlüssel mit ungültiger Verschlüsselung %d - "
 "übersprungen\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "Importieren geheimer Schlüssel ist nicht erlaubt\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Kein voreingestellter geheimer Schlüsselbund: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "Schlüssel %s: geheimer Schlüssel importiert\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "Schlüssel %s: Ist bereits im geheimen Schlüsselbund\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "Schlüssel %s: geheimer Schlüssel nicht gefunden: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "Schlüssel %s: Kein öffentlicher Schlüssel - der Schlüsselwiderruf kann nicht "
 "angebracht werden\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - zurückgewiesen\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat importiert\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "Schlüssel %s: Keine User-ID für Signatur\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren für User-ID \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "Schlüssel %s: Ungültige Eigenbeglaubigung für User-ID \"%s\"\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "Schlüssel %s: Nicht unterstütztes Public-Key-Verfahren\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "Schlüssel %s: Ungültige \"direct-key\"-Signatur\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "Schlüssel %s: Kein Unterschlüssel für die Unterschlüsselanbindung\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "Schlüssel %s: Ungültige Unterschlüssel-Anbindung\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "Schlüssel %s: Mehrfache Unterschlüssel-Anbindung entfernt\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "Schlüssel %s: Kein Unterschlüssel für Schlüsselwiderruf\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "Schlüssel %s: Ungültiger Unterschlüsselwiderruf\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "Schlüssel %s: Mehrfacher Unterschlüsselwiderruf entfernt\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "Schlüssel %s: User-ID übersprungen \"%s\"\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "Schlüssel %s: Unterschlüssel übersprungen\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "Schlüssel %s: Nicht exportfähige Signatur (Klasse %02x) - übersprungen\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "Schlüssel %s: Widerrufzertifikat an falschem Platz - übersprungen\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "Schlüssel %s: Ungültiges Widerrufzertifikat: %s - übersprungen\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "Schlüssel %s: Unterschlüssel-Widerrufzertifikat an falschem Platz - "
 "übersprungen\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "Schlüssel %s: unerwartete Signaturklasse (0x%02x) - übersprungen\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "Schlüssel %s: Doppelte User-ID entdeckt - zusammengeführt\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "WARNUNG: Schlüssel %s ist u.U. widerrufen: hole Widerrufschlüssel %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "WARNUNG: Schlüssel %s ist u.U. widerrufen: Widerrufschlüssel %s ist nicht "
 "vorhanden\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "Schlüssel %s: \"%s\" Widerrufzertifikat hinzugefügt\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "Schlüssel %s: \"direct-key\"-Signaturen hinzugefügt\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 "Hinweis: Eine Schlüsselseriennr stimmt nicht mit derjenigen der Karte "
 "überein\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Hinweis: Hauptschlüssel ist online und auf der Karte gespeichert\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Hinweis: Zweitschlüssel ist online und auf der Karte gespeichert\n"
 
@@ -3334,12 +3344,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User-ID \"%s\" ist widerrufen."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Wollen Sie ihn immer noch beglaubigen? (j/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Beglaubigen ist nicht möglich.\n"
 
@@ -3528,8 +3538,8 @@ msgstr "Ich habe diesen Schlüssel sehr sorgfältig überprüft.\n"
 msgid "Really sign? (y/N) "
 msgstr "Wirklich signieren? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Beglaubigung fehlgeschlagen: %s\n"
@@ -3585,186 +3595,186 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Möchten Sie dies wirklich tun? (j/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "schiebe eine Beglaubigung an die richtige Stelle\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "speichern und Menü verlassen"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "Fingerabdruck des Schlüssels anzeigen"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "Schlüssel und User-IDs auflisten"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "User-ID N auswählen"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "Unterschlüssel N auswählen"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "Signaturen prüfen"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "die ausgewählten User-IDs beglaubigen [* für verwandte Befehle s.u.]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "Die ausgewählte User-ID nur für diesen Rechner beglaubigen"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "Die ausgewählte User-ID mit einer \"Trust\"-Signatur beglaubigen"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "die ausgewählten User-IDs unwiderrufbar beglaubigen"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "Eine User-ID hinzufügen"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "Eine Foto-ID hinzufügen"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "ausgewählte User-IDs entfernen"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "einen Unterschlüssel hinzufügen"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "der Smartcard einen Schlüssel hinzufügen"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "einen Schlüssel auf die Smartcard schieben"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "eine Sicherungskopie des Schlüssels auf die Smartcard schieben"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "ausgewählte Unterschlüssel entfernen"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "Einen Widerrufschlüssel hinzufügen"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs entfernen"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "das Verfallsdatum des Schlüssel oder ausgewählter Unterschlüssels ändern"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "User-ID als Haupt-User-ID kennzeichnen"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "Umschalten zwischen dem Auflisten geheimer und öffentlicher Schlüssel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "Liste der Voreinstellungen (für Experten)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "Liste der Voreinstellungen (ausführlich)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "ändern der Voreinstellungsliste der ausgewählten User-IDs"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "Setze die URL des bevorzugten Schlüsselservers für die ausgewählten User-IDs"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "Eine Notation für die ausgewählten User-IDs setzen"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "Die Passphrase ändern"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "Den \"Owner trust\" ändern"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "Beglaubigungen der ausgewählten User-IDs widerrufen"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "Ausgewählte User-ID widerrufen"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "Schlüssel oder ausgewählten Unterschlüssel widerrufen"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "Schlüssel anschalten"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "Schlüssel abschalten"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "ausgewählte Foto-IDs anzeigen"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "unbrauchbare User-IDs verkleinern und unbrauchbare Signaturen aus dem "
 "Schlüssel entfernen"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "unbrauchbare User-IDs verkleinern und alle Signaturen aus dem Schlüssel "
 "entfernen"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Fehler beim Lesen des geheimen Schlüsselblocks \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Geheimer Schlüssel ist vorhanden.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Hierzu wird der geheime Schlüssel benötigt.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bitte verwenden sie zunächst den Befehl \"toggle\"\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3777,229 +3787,229 @@ msgstr ""
 "Signaturen\n"
 " (\"nrsign\"), oder jede Kombination davon (\"ltsign\", \"tnrsign\", etc.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Schlüssel wurde widerrufen."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Wirklich alle User-IDs beglaubigen? (j/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tip: Wählen Sie die User-IDs, die beglaubigt werden sollen\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Unbekannter Signaturtyp `%s'\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Dieser Befehl ist im %s-Modus nicht erlaubt.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Zumindestens eine User-ID muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Die letzte User-ID kann nicht gelöscht werden!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Möchten Sie alle ausgewählten User-IDs wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Diese User-ID wirklich entfernen? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Den Hauptschlüssel wirklich verschieben? (j/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Sie müssen genau einen Schlüssel auswählen.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Befehl benötigt einen Dateinamen als Argument\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "'%s' kann nicht geöffnet werden: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fehler beim Lesen der Sicherungskopie des Schlüssels von `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Zumindestens ein Schlüssel muß ausgewählt werden.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Möchten Sie die ausgewählten Schlüssel wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich entfernen? (j/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Möchten Sie wirklich alle ausgewählten User-IDs widerrufen? (j/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Diese User-ID wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich vollständig widerrufen? (j/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Möchten Sie die ausgewählten Unterschlüssel wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Möchten Sie diesen Schlüssel wirklich widerrufen? (j/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "\"Owner trust\" kann nicht gesetzt werden, wenn eine anwendereigene 'Trust'-"
 "Datenbank benutzt wird\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Setze die Liste der Voreinstellungen auf:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Möchten Sie die Voreinstellungen der ausgewählten User-IDs wirklich ändern? "
 "(j/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Die Voreinstellungen wirklich ändern? (j/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Änderungen speichern? (j/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Beenden ohne zu speichern? (j/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Änderung fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Änderung des Geheimnisses fehlgeschlagen: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Schlüssel ist nicht geändert worden, also ist kein Speichern nötig.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Eigenschaften: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Keyserver no-modify"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Bevorzugter Schlüsselserver:"
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "\"Notationen\": "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x-artige Schlüssel haben keine Voreinstellungen.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Dieser Schlüssel wurde am %s von %s Schlüssel %s widerrufen\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Dieser Schlüssel könnte durch %s mit Schlüssel %s  widerrufen worden sein"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(empfindlich)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "erzeugt: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "widerrufen: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "verfallen: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "verfällt: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "Aufruf: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "Vertrauen: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "Gültigkeit: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Hinweis: Dieser Schlüssel ist abgeschaltet"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "Kartennummer:"
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4007,18 +4017,18 @@ msgstr ""
 "Bitte beachten Sie, daß ohne einen Programmneustart die angezeigte\n"
 "Schlüsselgültigkeit nicht notwendigerweise korrekt ist.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "widerrufen"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "verfallen"
 
 # translated by wk
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4026,7 +4036,7 @@ msgstr ""
 "WARNUNG: Keine User-ID ist als primär markiert.  Dieser Befehl kann\n"
 "dazu führen, daß eine andere User-ID als primär angesehen wird.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4036,74 +4046,74 @@ msgstr ""
 "könnte\n"
 "         bei einigen PGP-Versionen zur Zurückweisung des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Wollen Sie ihn immer noch hinzufügen? (j/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Sie können einem PGP2-artigen Schlüssel keine Foto-ID hinzufügen.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Diese korrekte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Diese ungültige Beglaubigung entfernen= (j/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Diese unbekannte Beglaubigung entfernen? (j/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Eigenbeglaubigung wirklich entfernen? (j/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d Beglaubigungen entfernt.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nichts entfernt.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "ungültig"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User-ID \"%s\" bereits verkleinert: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User-ID \"%s\": %d Signatur entfernt\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User-ID \"%s\": %d Signaturen entfernt\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User-ID \"%s\": bereits minimiert\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User-ID \"%s\": bereits sauber\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4113,202 +4123,202 @@ msgstr ""
 "         Widerrufers könnte bei einigen PGP-Versionen zur Zurückweisung\n"
 "         des Schlüssels führen.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Sie können einem PGP2-artigen Schlüssel keine vorgesehenen Widerrufer "
 "hinzufügen.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Geben sie die User-ID des designierten Widerrufers ein: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "Ein PGP 2.x-artiger Schlüssel kann nicht als vorgesehener Widerrufer "
 "eingetragen werden\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Ein Schlüssel kann nicht sein eigener vorgesehener Widerrufer werden\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "Dieser Schlüssel wurde bereits als ein Widerrufer vorgesehen\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "WARNUNG: Einen Schlüssel als vorgesehenen Widerrufer zu deklarieren, kann "
 "nicht rückgangig gemacht werden!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Möchten Sie diesen Schlüssel wirklich als vorgesehenen Widerrufer festlegen? "
 "(j/N): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bitte entfernen Sie die Auswahl von den geheimen Schlüsseln.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Bitte wählen Sie höchstens einen Unterschlüssel aus.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändern des Verfallsdatums des Unterschlüssels.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändern des Verfallsdatums des Hauptschlüssels.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Sie können das Verfallsdatum eines v3-Schlüssels nicht ändern\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Keine entsprechende Signatur im geheimen Schlüsselbund\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Signaturunterschlüssel %s ist bereits rücksigniert\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "Unterschlüssel %s ist des Signieren nicht mächtig und braucht deshalb keine "
 "Rücksignatur\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Bitte genau eine User-ID auswählen.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Überspringen der v3 Eigenbeglaubigung von User-ID \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Geben Sie die URL Ihres bevorzugten Schlüsselservers ein: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Wollen Sie ihn wirklich ersetzen? (j/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Wollen Sie ihn wirklich löschen? (j/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Geben Sie die \"Notation\" ein: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "Fortfahren (j/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Keine User-ID mit Index %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Keine User-ID mit Hash %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kein Unterschlüssel mit Index %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User-ID: \"%s\"\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   beglaubigt durch Ihren Schlüssel %s am %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (nicht-exportierbar)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Diese Signatur ist seit %s verfallen.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Wollen Sie ihn immer noch widerrufen? (j/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Ein Widerrufszertifikat für diese Signatur erzeugen (j/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr "Nicht von Ihnen signiert.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Sie haben folgende User-IDs des Schlüssels %s beglaubigt:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (unwiderrufbar)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "widerrufen durch Ihren Schlüssel %s um %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Es werden nun folgende Beglaubigungen entfernt:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Wirklich ein Signatur-Widerrufszertifikat erzeugen? (j/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "Kein geheimer Schlüssel\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User-ID \"%s\" ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "WARNUNG: Eine User-ID-Signatur datiert mit %d Sekunden aus der Zukunft\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Schlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Unterschlüssel %s ist bereits widerrufen\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Anzeigen einer %s Foto-ID (Größe %ld) für Schlüssel %s (User-ID %d)\n"
@@ -5458,13 +5468,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "dieses Public-Key Verfahren %d kann nicht benutzt werden\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "WARNUNG: Möglicherweise unsicherer symmetrisch verschlüsselter "
 "Sitzungsschlüssel\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "Im Unterpaket des Typs %d ist das \"critical bit\" gesetzt\n"
@@ -5858,28 +5868,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Daten wurden nicht gespeichert; verwenden Sie dafür die Option \"--output\"\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Abgetrennte Beglaubigungen.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Bitte geben Sie den Namen der Datendatei ein: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "lese stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "keine signierten Daten\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kann signierte Datei '%s' nicht öffnen.\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kann signierte Daten auf fd=%d nicht öffnen: %s\n"
diff --git a/po/el.po b/po/el.po
index 2c41f8dba..6d153046c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2003-06-27 12:00+0200\n"
 "Last-Translator: Dokianakis Theofanis <[email protected]>\n"
 "Language-Team: Greek <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "�������� ����������� ��� `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -327,7 +327,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "������ ��� ������ ������"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -338,108 +338,108 @@ msgstr ""
 "��������:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "���������"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "����� ������"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|������|������� ��� ���������� ��������� ������"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "��������� �������� �� ��� ���������� ��������"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "�������� ��� ����� ��������� ������������"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -447,158 +447,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "��������� �� ���������� ��� <[email protected]>\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�����: gpg [��������] [������] (-h ��� �������)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "��������: �� �������������� ������ �������� `%s'\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "������ �������� `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "�������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�������� ����������� ��������� `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "������ ��� �������� ���� �� `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: ��������� �������������\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read ������� (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: �������� ����������� ���������: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ������������: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "� gpg-agent ��� ����� ���������� �� ���� �� ��������\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "��������������� ��������� ������������� GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -806,7 +806,7 @@ msgstr "������ ��� ���������� ��� ������ ������: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "�������� ��������� ��� �������: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -821,7 +821,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "�������� �������� �������� ����������� `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -831,7 +831,7 @@ msgstr "������ ���� ��� �������� ��� `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "������ ���� ��� �������� ��� `%s': %s\n"
@@ -945,11 +945,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1201,47 +1206,47 @@ msgstr "�� ����������� ��������:"
 msgid "invalid dash escaped line: "
 msgstr "�� ������ dash escaped ������: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "�� ������� radix64 ���������� %02x ���������\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "������ ����� ������� (������� CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "������ ����� ������� (����� CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "����� ����� CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "������ CRC: %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "������ ����� ������� (��� �railer)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "������ ��� ������ trailer\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "�� �������� ������ OpenPGP ��������.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�� ������ ��������: � ������ ����� ���� ��� %d ����������\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1287,7 +1292,7 @@ msgstr "�� ������� ������ ��� ����� ���������"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1572,7 +1577,7 @@ msgstr "������������: ������� ������ ��� �����\n"
 msgid "error writing key to card: %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "����������� ����� ��� �����"
 
@@ -1581,7 +1586,7 @@ msgstr "����������� ����� ��� �����"
 msgid "show admin commands"
 msgstr "������������� �������\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "���������� ����� ��� ��������"
 
@@ -1661,7 +1666,7 @@ msgstr "������������� �������\n"
 msgid "Admin commands are not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�� ������ ������  (��������� \"help\")\n"
 
@@ -1669,18 +1674,18 @@ msgstr "�� ������ ������  (��������� \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output ��� ���������� ��� ���� ��� ������\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1980,7 +1985,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "�� ������ ������ %08lX ����� ������ ��� �� --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "������ ������� ��������� ��� �� ������� ��������� %08lX - �������\n"
@@ -2222,7 +2227,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "�����������:"
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "���������������: "
 
@@ -2230,7 +2235,7 @@ msgstr "���������������: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "��������: "
 
@@ -2375,416 +2380,416 @@ msgstr "��������: ��������� �� ����� ������ ��������������� �������� `%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "��������: �� %s ��� ����� ��� �������� �����!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �� ������� �������� ���������\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�� ������� �������� ���������\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "�� %s ��� ����� ������ ��� ����������\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�� ������� �������� ��������\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "�������� ������� ��� exec-path �� %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �� ������� �������� ��������\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "�������������: �� ��������� ���� ������������ ������ core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�������������: �� %s ����������� �� %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�� %s ��� ����������� �� �� %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�� %s ��� ���� ������ ������ ���� �� �� %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "�������� �� ������ ����������� � ������� ��������� ���� �� --pgp2 ���������\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "��� �������� �� ���������� ��� �� �������������� ���������� �� --pgp2 "
 "���������\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "���� ������ ������������ (��� ��� pipes) ���� ��� ��������� --pgp2.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "� ������������� ���� ��������� �� --pgp2 ��������� ������� ��� �����. IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "� ����������� ���������� ��������� ��� ����� �������\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "� ����������� ���������� �������������� ��� ����� �������\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr ""
 "� ����������� ���������� ��������� ��� �����������\n"
 "��� ����� �������\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed ������ �� ����� ���������� ��� 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed ������ �� ����� ���������� ��� 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth ������ �� ����� ������ 1 ��� 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�� ������ default-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�� ������ min-cert-level� ������ �� ����� 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "��������: � ���� S2K ��������� (0) ������ �� �����������\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�� ������ ��������� S2K; ������ �� ����� 0, 1 � 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "�� ������� �����������\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "�� ������� ����������� ���������� ���������������\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "�� ������� ����������� ���������� ���������� ���������\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�� %s ����� �� ���������� ���� �� �� %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "����������� � ����� ��� ��������������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "����������� � ����� ��� ���������� ��������� \"%s\" ���� ��������� %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "�������� ������������� ��� TrustDB: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "�������������: ������� ���������� (-r) ����� ����� ��������������\n"
 "�������� ��������\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [����� �������]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [����� �������]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "���������������� �������: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [����� �������]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [����� �������]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [����� �������]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "����������� � ����� ��� %s ���� ��������� %s.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [����� �������]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [����� �������]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [����� �������]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [�������]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "keyserver ���� �������: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "������� �������� �������: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "keyserver ��������� �������: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "keyserver �������� �������: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "����������� �������: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�������� �������: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�� ������� ����������  hash `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[����� �������]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "�������� ���� �� ���������� �� ������ ��� ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "�� URL ��������� �������������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "�� URL ��������� ��������� ��� ������ ��� ����� ������\n"
@@ -2940,342 +2945,347 @@ msgstr "        ���� ���������: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      ����������� ������� �������: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s ��������, ���������� ��������� %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "������ %08lX: ����������� ��������� ����������� HKP\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "������ %08lX: ����� �� ����-������������� user ID '%s'\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "������ %08lX: ��� ���� ������ user ID\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���� ������ �� ������� ��� ��� ������ ������������\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "������ %08lX: ������� ������ ��� �� �������: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "������ %08lX:  ��� ������ - ������������\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "��� ������� ��������� ����������: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "������� ���  `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "�������� �������� ��� ����������� `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "������ %08lX: �� ������� ������ \"%s\" ���� ��������\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "������ %08lX: ��� ��������� �� �� ��������� ���\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "������ %08lX: �������� ���������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "������ %08lX: �������� ��������� ��� ������� �������� ��������: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "������ %08lX: \"%s\" 1 ��� user ID\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ��������\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "������ %08lX: \"%s\" 1 ��� ���������\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "������ %08lX: \"%s\" %d ��� ����������\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ���� ���������\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "������ %08lX: \"%s\" %d ��� user ID\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "������ %08lX: \"%s\" ����������\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "������ %08lX: ������� ������ �� ����� ��������. %d - ������������\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "������� ��� �������� �������� ��� `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "��� ������� �������������� ����������: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "������ %08lX: ������� ������ ���������\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "������ %08lX: ��� ��� ������� ����������\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "������ %08lX: �� ������� �� ������� ������: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "������ %08lX: ��� ������� ������ - �������� ��������� �������������� "
 "���������\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ��������\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ���������\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "������ %08lX: ��� ������� user ID ��� ��� ��������\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "������ %08lX: �� ��������������� ���������� �������� �������� ��� user id \"%"
 "s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "������ %08lX: �� ������ ����-�������� ��� user id \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "������ %08lX: �� ��������������� ���������� �������� ��������\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "������ %08lX: ����� �������� �������� ����������\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "������ %08lX: ��� ������� ��������� ��� �� �������� ��������\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "������ %08lX: ��� ������� ��������� ��� ��� �������� ��������\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "������ %08lX: �� ������ �������� �����������\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "������ %08lX: ���������� � �������� ��������� �����������\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "������ %08lX: ������������ user ID '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "������ %08lX: ������������ ���������\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ��������� �������� (����� %02x) - ������������\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "������ %08lX: �� ������������� ��������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "������ %08lX: �� ������ ������������� ���������: %s - ������������\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr ""
 "������ %08lX: � �������� ��� ����������� �� ����� ������ - ������������\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "������ %08lX: �� ����������� ����� ��������� (0x%02x) - ������������\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "������ %08lX: ����������� ����� user ID - ��������\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: ���� �������� ��������� %"
 "08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "�������������: ������ %08lX ������ �� ���������: �� ������ ��������� %08lX\n"
 "��� ����� �����.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "������ %08lX: \"%s\" ������������� ��������� ����������\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "������ %08lX: ����� �������� �������� ����������\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�� ������� ������ ��� ��������� �� �� �������!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "������������: ������� ������ ��� �����\n"
@@ -3384,12 +3394,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�� user ID \"%s\" ����������."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "������� ������ ����� �� �� ����������; (y/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  �������� ���������.\n"
 
@@ -3604,8 +3614,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "������� �� ���������; "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "� �������� �������: %s\n"
@@ -3659,204 +3669,204 @@ msgstr "��� ������ ����� ������ - ���� ����� ������ *����* ����!\n"
 msgid "Do you really want to do this? (y/N) "
 msgstr "������� ������ �� ������ ����; "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "���������� ��������� �������� ��� ����� ����\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "���������� ��� ������"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "���������� ��� fingerprint"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "���������� ��� �������� ��� ��� user ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "������� user ID N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "�������� ���������"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "�������� ��� �������� ������"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "�������� ���� photo ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "�������� ���� �������� ���������"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�������� ��� user ID ��� ��������"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "������ ������ ��� ����������� �������� ��� �������� ��������"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "���������� ����������� (�������)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "���������� �������� (���������)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�������� ������������ ��� URI ��� ��������� ��������\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "������ ��� ������ ������"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "������ ��� ������������ ���������"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�������� ���� user ID"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�������� ���� ������������� ��������"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "����������� ��� ������"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "������������� ��� ������"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "���������� photo ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "������ ���� ��� �������� �������� ����� �������� `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "�� ������� ������ ����� ���������.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "���������� �� ������� ������ ��� �� ����� ����.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�������� ��������������� ��� ������ \"toggle\" �����.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3864,243 +3874,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "�� ������ ����������."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "������� �� ���������� ��� �� user ID; "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "��������: �������� �� user ID ��� ��������\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "������� ����� ���������"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "���� � ������ ����������� �� ���� ��� ��������� %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "������ �� ��������� �� �������� ��� user ID.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "��� �������� �� ���������� �� ��������� user ID!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "�������� ��������� ��� `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "�������� ����������� ��� ����������� `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "������ �� ��������� ����������� ��� ������.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "������� ������ �� ���������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� user ID; "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "������� ������ �� ���������� �� ���������� �������; "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "������� ����������� ��������"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "������� ������ �� ���������� �� ����������� ��� �� ���������� user ID; "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "������� �� ���������� �� �����������;"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "���������� ��� �������; "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "����������� ����� ����������; "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "� ��������� �������: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "� ��������� �������� �������: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "�� ������ ��� ������ ����� ��� ���������� ���������.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "����������: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "��������: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "��� �������� ����������� �� ��� user ID ����� PGP 2.x.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���� �� ������ ������ �� ��������� ��� %s ������ "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (���������)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "�������� ����������� ��� %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[����������]"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [�����: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " �����������: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "���� �� ������ ���� ���������������"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4108,19 +4118,19 @@ msgstr ""
 "� ���������� ��� ��������������� �������� ��� ����� ���������� �����\n"
 "����� ��� ��� �������������� �� ���������.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[����������]"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4128,7 +4138,7 @@ msgstr ""
 "�������������: ��� ���� ��������� ID ������ ��� ��������.  ���� � ������\n"
 "              ������ �� ����� ��� ���� ID ������ �� ����� �� ��������.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4137,75 +4147,75 @@ msgstr ""
 "�������������: ���� ����� ��� ������ ����� PGP2. � �������� ���� photo ID\n"
 "               ������ �� ����� ������� �������� PGP �� �� ����������.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "������� ����� ������ �� �� ����������; (y/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "��� �������� �� ���������� ��� photo ID �� ��� ������ ����� PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�������� ����� ��� ����� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�������� ����� ��� �� ������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�������� ����� ��� �������� ���������; (y/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "������� �� ��������� ���� � ����-��������; (y/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "����������� %d ��������.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "����������� %d ���������.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "������ ��� �����������.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "�� ������ ��������"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�� user ID \"%s\" ����������."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4215,38 +4225,38 @@ msgstr ""
 "               ������������ �������� ������ �� ����� ������� �������� PGP\n"
 "               �� �� ����������.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "��� �������� �� ���������� ��� ����������� �������� �� ������ ����� PGP2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�������������� �� user ID ��� ����������� ��������: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "�������� ������� ���� �������� ����� PGP 2.x, ��� ����������� ��������\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "�� �������� �� ������� ��� ������ ��� �� ���������� �������� ��� ������ ���\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "�������������: ���� �� ������ ���� ��������� ��� ��� �������� ��������!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�������������: ��� ������� ��� ������ ��� ���������� �������� ��� ������ �� "
 "���������!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
@@ -4254,173 +4264,173 @@ msgstr ""
 "����� �������� ��� ������ �� ������� ��� ������ ��� ���������� ��������; (y/"
 "N): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "�������� ��������� ��� �������� ��� �� ������� �������.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�������� �������� �� ���� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ ����������� ����� ��� ��� ���������� ������.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "������ ����������� ����� ��� ��� �������� ������.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "��� �������� �� �������� ��� ���������� ����� �� ��� v3 ������\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "��� ������� ���������� �������� ��� ������� ����������\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "�������������: �� ��������� ��������� %08lX ��� ���� ���' ������������� "
 "������������\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "������ �� ��������� ������� ��� user ID.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "������������ � v3 ����-�������� ��� user id \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "������� ������ ����� �� �� ���������������; (y/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "�������� ���������: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��������� (y/N); "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "��� ������� user ID �� ������ %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ����������� ��� %08lX ���� %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���� � �������� ����� ���� %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "������� ������ �� ��������� ���� �� ������; "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���������� ���� �������������� ��������� ��� ���� ��� ��������; (y/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   ����������� ��� %08lX ���� %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "����� ��������� ���� �� user ID:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (��-���������)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   ���������� ��� %08lX ���� %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "��������� �� ����������� ����� ��� ���������:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "������� �� ������������� �� ������������� ���������; (y/N)"
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "������ ������� ������\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "�������������: ��� �������� user ID ���� ���������� %d ������� ��� ������\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�� user ID \"%s\" ���� ��� ���������\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "���������� %s photo ID �������� %ld ��� �� ������ 0x%08lX (uid %d)\n"
@@ -5582,11 +5592,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������� ��������� ��� ���������� �������� �������� %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�������������: ������� �� ������� ��������������� ���������� ������\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��������� ����� %d ���� �������� �� ������� bit\n"
@@ -5983,28 +5993,28 @@ msgstr "������ %08lX: ��� ������� ���� �� user ID\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "�������� ��� �������������. ���������� �� ��� ������� \"--output\"\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "���������� ��������.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "�������� �� ����� ������� ���������: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "�������� ��� stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "��� �������� ������������� ��������\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "�������� ��������� �������������� ��������� `%s'\n"
diff --git a/po/eo.po b/po/eo.po
index 1cdf5133f..999948571 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0.6d\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2002-04-14 14:33+0100\n"
 "Last-Translator: Edmund GRIMLEY EVANS <[email protected]>\n"
 "Language-Team: Esperanto <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "ne povas krei '%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -339,107 +339,107 @@ msgstr ""
 "Opcioj:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detala eligo"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "iom malpli da informoj"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|DOSIERO|legi aldonan bibliotekon DOSIERO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "ser�i �losilojn �e �losilservilo"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualigi la fido-datenaron"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -447,158 +447,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Bonvolu raporti cimojn al <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uzado: gpg [opcioj] [dosieroj] (-h por helpo)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "opcio-dosiero '%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "legas opciojn el '%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ne povas krei %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Valida atestilrevoko"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eraro dum kreado de pasfrazo: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eraro dum sendo al '%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: dosierujo kreita\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fido-datenaro: lego malsukcesis (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: ne povas krei dosierujon: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu �losiloj ignoritaj\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "malbona valoro de la media variablo GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -806,7 +806,7 @@ msgstr "eraro dum kreado de pasfrazo: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ne povas malfermi %s: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -821,7 +821,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "eraro dum skribado de sekreta �losilaro '%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -831,7 +831,7 @@ msgstr "eraro dum legado de '%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eraro dum legado de '%s': %s\n"
@@ -946,11 +946,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1206,47 +1211,47 @@ msgstr "neatendita kiraso:"
 msgid "invalid dash escaped line: "
 msgstr "nevalida strek-eskapita linio: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "nevalida signo %02x en bazo 64 ignorita\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "tro frua dosierfino (nenia CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "tro frua dosierfino (en CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "misformita CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-eraro; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "tro frua dosierfino (en vosto)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "eraro en vostolinio\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "validaj OpenPGP-datenoj ne trovitaj.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "nevalida kiraso: linio pli longa ol %d signojn\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1294,7 +1299,7 @@ msgstr "sekreta �losilo ne havebla"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1579,7 +1584,7 @@ msgstr "ignorita: sekreta �losilo jam �eestas\n"
 msgid "error writing key to card: %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "forlasi �i tiun menuon"
 
@@ -1588,7 +1593,7 @@ msgstr "forlasi �i tiun menuon"
 msgid "show admin commands"
 msgstr "malkongruaj komandoj\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "montri �i tiun helpon"
 
@@ -1668,7 +1673,7 @@ msgstr "malkongruaj komandoj\n"
 msgid "Admin commands are not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Nevalida komando (provu per \"helpo\")\n"
 
@@ -1676,18 +1681,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1968,7 +1973,7 @@ msgstr "Fingrospuro:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Nevalida �losilo %08lX validigita per --always-trust\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "estas sekreta �losilo por la publika �losilo \"%s\"!\n"
@@ -2210,7 +2215,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr ""
 
@@ -2218,7 +2223,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 #, fuzzy
 msgid "Compression: "
 msgstr "Komento: "
@@ -2361,415 +2366,415 @@ msgstr "NOTO: mankas implicita opcio-dosiero '%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTO: %s ne estas por normala uzado!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "nevalida kiraso"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ne estas valida signaro\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "nevalida �losilaro"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVERTO: '%s' estas malplena dosiero\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTO: programo povas krei core-dosieron!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTO: %s nuligas %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ne eblas kun %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "eblas fari nur apartajn kaj klartekstajn subskribojn kun --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "ne eblas samtempe subskribi kaj �ifri kun --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "necesas uzi dosierojn (kaj ne tubon) kun --pgp2\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifri mesa�on kun --pgp2 postulas la �ifron IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "elektita �ifrad-metodo ne validas\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "elektita kompendi-metodo ne validas\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed devas esti pli granda ol 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed devas esti pli granda ol 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth devas esti inter 1 kaj 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nevalida default-check-level; devas esti 0, 1, 2 a� 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTO: simpla S2K-re�imo (0) estas forte malrekomendata\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "nevalida S2K-re�imo; devas esti 0, 1 a� 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "nevalidaj preferoj\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne havas sencon kun %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "malsukcesis doni komencajn valorojn al fido-datenaro: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [dosiero]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosiero]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "mal�ifrado malsukcesis: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosiero]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [dosiero]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosiero]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [dosiero]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosiero]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosiero]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key uzantidentigilo"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key uzantidentigilo [komandoj]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key uzantidentigilo"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "Kreado de �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record malsukcesis: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "listigo de sekretaj �losiloj malsukcesis: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "elkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enkirasigo malsukcesis: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "nevalida kompendi-metodo '%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[dosiero]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Ektajpu vian mesa�on ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por atestado ne validas\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la donita gvidlinia URL por subskriboj ne validas\n"
@@ -2923,332 +2928,337 @@ msgstr "            novaj subskriboj: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   sekretaj �losiloj legitaj: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s-subskribo de: %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "�losilo %08lX: akceptis ne-mem-subskribitan uzantidentigilon '"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "�losilo %08lX: mankas valida uzantidentigilo\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tio povas esti ka�zata de mankanta mem-subskribo\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "�losilo %08lX: publika �losilo ne trovita: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "�losilo %08lX: nova �losilo - ignorita\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "neniu skribebla �losilaro trovita: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skribas al '%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eraro dum skribado de �losilaro '%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "�losilo %08lX: publika �losilo importita\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "�losilo %08lX: diferencas de nia kopio\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas trovi originalan �losilblokon: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "�losilo %08lX: ne povas legi originalan �losilblokon: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "�losilo %08lX: 1 nova uzantidentigilo\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "�losilo %08lX: 1 nova subskribo\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "�losilo %08lX: 1 nova sub�losilo\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "�losilo %08lX: %d novaj sub�losiloj\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "�losilo %08lX: %d novaj subskriboj\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "�losilo %08lX: %d novaj uzantidentigiloj\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "�losilo %08lX: ne �an�ita\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "�losilo %08lX: sekreta �losilo sen publika �losilo - ignorita\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "skribas sekretan �losilon al '%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "mankas implicita sekreta �losilaro: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "�losilo %08lX: sekreta �losilo importita\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "�losilo %08lX: jam en sekreta �losilaro\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "�losilo %08lX: sekreta �losilo ne trovita: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "�losilo %08lX: publika �losilo mankas - ne povas apliki revokatestilon\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - malakceptita\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "�losilo %08lX: revokatestilo importita\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "�losilo %08lX: mankas uzantidentigilo por subskribo\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "�losilo %08lX: nerealigita publik�losila metodo\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "�losilo %08lX: mankas sub�losilo por �losilbindado\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "�losilo %08lX.%lu: Valida sub�losilrevoko\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "�losilo %08lX: nevalida sub�losila bindado\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "�losilo %08lX: ignoris uzantidentigilon '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "�losilo %08lX: ignoris sub�losilon\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "�losilo %08lX: nevalida revokatestilo: %s - ignorita\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "�losilo %08lX: revokatestilo en mal�usta loko - ignorita\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "�losilo %08lX: neeksportebla subskribo (klaso %02x) - ignorita\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "�losilo %08lX: trovis ripetitan uzantidentigilon - kunfandita\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "�losilo %08lX: revokatestilo aldonita\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "�losilo %08lX: rekta �losilsubskribo aldonita\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorita: sekreta �losilo jam �eestas\n"
@@ -3357,13 +3367,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3590,8 +3600,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�u vere subskribi? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "subskribado malsukcesis: %s\n"
@@ -3647,202 +3657,202 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "�u vi vere volas fari tion? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "movas �losilsubskribon al la �usta loko\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "skribi kaj fini"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "montri fingrospuron"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "listigi �losilojn kaj uzantidentigilojn"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "elekti uzantidentigilon N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revoki subskribojn"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "subskribi la �losilon loke"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "aldoni foto-identigilon"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "forvi�i uzantidentigilon"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "al"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "forvi�i flankan �losilon"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "add a revocation key"
 msgstr "aldoni flankan �losilon"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marku uzantidentigilon kiel �efan"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "de sekreta a� publika listo iri al la alia"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "listigi preferojn (spertula)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "listigi preferojn (detale)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ne povis analizi URI de �losilservilo\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "�an�i la pasfrazon"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "�an�i la posedantofidon"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "aldoni uzantidentigilon"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoki flankan �losilon"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "�alti �losilon"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "mal�alti �losilon"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "montri foto-identigilon"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eraro dum legado de sekreta �losilbloko '%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Sekreta �losilo estas havebla.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Bezonas la sekretan �losilon por fari tion.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Bonvolu uzi la komandon \"toggle\" unue.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3850,267 +3860,267 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 #, fuzzy
 msgid "Key is revoked."
 msgstr "�losilo estas revokita.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�u vere subskribi �iujn uzantidentigilojn? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugesto: Elekti la uzantidentigilojn por subskribi\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nekonata klaso de subskribo"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tiu komando ne eblas en la re�imo %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Vi devas elekti almena� unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Vi ne povas forvi�i la lastan uzantidentigilon!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "ne povas malfermi '%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "eraro dum kreado de �losilaro '%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Vi devas elekti almena� unu �losilon.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�u vi vere volas forvi�i la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�u vi vere volas forvi�i �i tiun �losilon? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�u vere forigi �iujn elektitajn uzantidentigilojn? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�u vere forigi �i tiun uzantidentigilon? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�u vi vere volas revoki la elektitajn �losilojn? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�u vi vere volas revoki �i tiun �losilon? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "agordi liston de preferoj"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "�u vere aktualigi la preferojn por la elektitaj uzantidentigiloj? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�u vere aktualigi la preferojn? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�u skribi �an�ojn? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�u fini sen skribi �an�ojn? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualigo malsukcesis: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualigo de sekreto malsukcesis: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "�losilo ne �an�ita, do aktualigo ne necesas.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Notacio: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "�i tiu �losilo estas revokebla per %s �losilo %s%s\n"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sentema)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ne povas krei %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "rev"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [eksvalidi�os: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fido: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "�i tiu �losilo estas mal�altita"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "rev"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "eksval"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4119,75 +4129,75 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun bonan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nevalidan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�u forvi�i �i tiun nekonatan subskribon? (j/N/f)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�u vere forvi�i �i tiun mem-subskribon? (j/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Forvi�is %d subskribon.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Forvi�is %d subskribojn.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nenio estis forvi�ita.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "nevalida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 #, fuzzy
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
@@ -4197,206 +4207,206 @@ msgstr ""
 "AVERTO: �i tiu estas PGP2-stila �losilo. Aldono de foto-identigilo eble\n"
 "        ka�zos, ke iuj versioj de PGP malakceptos la �losilon.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 #, fuzzy
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Ne eblas aldoni foto-identigilon al PGP2-stila �losilo.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Donu la �losilgrandon"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVERTO: �i tiu �losilo estas revokita de sia posedanto!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Bonvolu malelekti la sekretajn �losilojn.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Bonvolu elekti maksimume unu flankan �losilon.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "�an�as la daton de eksvalidi�o de flanka �losilo.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�an�as la daton de eksvalidi�o de la �efa �losilo.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vi ne povas �an�i la daton de eksvalidi�o de v3-�losilo\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Mankas responda subskribo en sekreta �losilaro\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Bonvolu elekti precize unu uzantidentigilon.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�losilo %08lX: nevalida mem-subskribo\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas subskribi �in?\n"
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Subskribo-notacio: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�u surskribi (j/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Mankas uzantidentigilo kun indekso %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "uzantidentigilo: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "�i tiu �losilo eksvalidi�os je %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�u vi estas certa, ke vi ankora� volas aldoni �in? (j/n) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�u krei revokatestilon por �i tiu subskribo? (j/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   subskribita per %08lX je %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vi subskribis la sekvajn uzantidentigilojn:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "subskribi �losilon nerevokeble"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokita de %08lX je %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vi revokos la sekvajn subskribojn:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�u vere krei la revokatestilojn? (j/N)"
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "mankas sekreta �losilo\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Uzantidentigilo \"%s\" estas revokita.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5557,11 +5567,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "ne povas trakti publik�losilan metodon %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaketo de speco %d havas �altitan \"critical bit\"\n"
@@ -5951,28 +5961,28 @@ msgstr "�losilo %08lX: mankas uzantidentigilo\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datenoj ne savitaj; uzu la opcion \"--output\" por savi ilin\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Aparta subskribo.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Bonvolu doni la nomon de la dosiero: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "legas la normalan enigon ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "mankas subskribitaj datenoj\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "ne povas malfermi subskribitan dosieron '%s'\n"
diff --git a/po/es.po b/po/es.po
index 241b0f75d..b60be58b3 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: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2008-12-14 19:34+0100\n"
 "Last-Translator: Jaime Su�rez <[email protected]>\n"
 "Language-Team: Spanish <[email protected]>\n"
@@ -141,7 +141,7 @@ msgstr "no se puede crear %s: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -361,7 +361,7 @@ msgstr "Por favor introduzca frase contrase�a para%0Aproteger su nueva clave"
 msgid "Please enter the new passphrase"
 msgstr "Por favor escriba la nueva frase contrase�a"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -370,102 +370,102 @@ msgstr ""
 "@Opciones:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "ejecutar en modo servidor (primer plano)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "ejecutar en modo demonio (segundo plano)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "prolijo"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "algo m�s discreto"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "salida de datos estilo sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "salida de datos estilo csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|FICHERO|lee opciones desde FICHERO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "no independizarse de la consola"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "no acaparar teclado y rat�n"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "usar un fichero log para el servidor"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "usar una localizaci�n est�ndar para el socket"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|usar PGM como el programa para entrada de PIN"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|usar PCM como programa SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "no usar SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "ignorar peticiones de cambiar el TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "ignorar peticiones de cambiar el display X"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|los PINs en la cach� expiran en N segundos"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "no usar el cach� de PINs al firmar"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "permitir que los clientes marquen claves como \"fiables\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "permitir preestablecer frase contrase�a"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "permitir emulaci�n de ssh-agent"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -473,11 +473,11 @@ msgstr "|FICHERO|escribir variables de entorno tambi�n en FICHERO"
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor, informe de posibles \"bugs\" a <"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg-agent [opciones] (-h para ayuda)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -485,145 +485,145 @@ msgstr ""
 "Sintaxis: gpg-agent [opciones] [orden [argumentos]]\n"
 "Manejo de claves privadas por GnuPG\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "el nivel de depuraci�n `%s` no es v�lido\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichero de opciones `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leyendo opciones desde `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "no se puede crear el directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "nombre de socket demasiado largo\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "no se puede crear el socket: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "el nombre de socket `%s' es demasiado largo\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "error obteniendo valor �nico para el socket\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "error enlazando el socket con `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() fall�: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escuchando el socket `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "directorio `%s' creado\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() fall� para `%s': %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "no puede usar `%s' como directorio personal\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, 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:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "manejador 0x%lx para descriptor %d iniciado\n"
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "manejador 0x%lx pada descriptor %d finalizado\n"
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, 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:1811
+#: agent/gpg-agent.c:1816
 #, 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:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, 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:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s detenido\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de entorno GPG_AGENT_INFO malformada\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -849,7 +849,7 @@ msgstr "error creando tuber�a: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "no puede abrirse tuber�a para leer: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "error bifurcando procesos: %s\n"
@@ -864,7 +864,7 @@ msgstr "fallo esperando que el proceso %d terminara: %s\n"
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
@@ -874,7 +874,7 @@ msgstr "error ejecutando `%s': c�digo de finalizaci�n %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "error ejecutando `%s': probablemente no est� instalado\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "error ejecutando `%s': terminado\n"
@@ -983,11 +983,16 @@ msgstr "agotado nucleo de memoria segura reservando %lu bytes"
 msgid "out of core while allocating %lu bytes"
 msgstr "error de memoria reservando %lu bytes"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "no hay gpg-agent en ejecuci�n - inicando uno\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "no puedo conectar con el agente - intentando retirada\n"
 
@@ -1219,46 +1224,46 @@ msgstr "armadura inesperada: "
 msgid "invalid dash escaped line: "
 msgstr "L�nea con guiones inv�lida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter inv�lido radix64 %02X omitido\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "Fin de fichero prematuro (falta suma de comprobaci�n)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "Fin de suma de comprobaci�n prematuro\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "Suma de comprobaci�n mal creada\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Error en suma de comprobaci�n: %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichero prematuro (en el cierre)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "error en la l�nea de cierre\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "no se han encontrados datos OpenPGP v�lidos\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: l�nea m�s larga de %d caracteres\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1303,7 +1308,7 @@ msgstr "tarjeta OpenPGP no disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "tarjeta OpenPGP num. %s detectada\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1571,7 +1576,7 @@ msgstr "clave secreta ya almacenada en una tarjeta\n"
 msgid "error writing key to card: %s\n"
 msgstr "error escribiendo clave: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "sale de este men�"
 
@@ -1579,7 +1584,7 @@ msgstr "sale de este men�"
 msgid "show admin commands"
 msgstr "ver �rdenes de administrador"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "muestra esta ayuda"
 
@@ -1651,7 +1656,7 @@ msgstr "Se permiten �rdenes de administrador\n"
 msgid "Admin commands are not allowed\n"
 msgstr "No se permiten �rdenes de administrador\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Orden inv�lida (pruebe \"help\")\n"
 
@@ -1659,18 +1664,18 @@ msgstr "Orden inv�lida (pruebe \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output no funciona con esta orden\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1950,7 +1955,7 @@ msgstr "No hay huella dactilar"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Clave %s inv�lida hecha v�lida mediante --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "no hay subclave secreta para la subclave p�blica %s - ignorada\n"
@@ -2187,7 +2192,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Clave p�blica: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cifrado: "
 
@@ -2195,7 +2200,7 @@ msgstr "Cifrado: "
 msgid "Hash: "
 msgstr "Resumen: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -2339,378 +2344,378 @@ msgstr "NOTA: se ignora el antiguo fichero de opciones predefinidas `%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt demasiado antigua (necesito %s, tengo %s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s no es para uso normal!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' no es una fecha de caducidad v�lida\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' no es un juego de caracteres v�lido\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "no se puede interpretar la URL del servidor de claves\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "opciones del servidor de claves inv�lidas\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "opciones de importaci�n inv�lidas\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "opciones de exportaci�n inv�lidas\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "lista de opciones inv�lida\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "mostrar foto IDs al verificar firmas"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "mostrar URLs de pol�tica al verificar firmas"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "mostrar todas las notaciones al verificar firmas"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "mostrar notaciones est�ndar IETF al verificar firmas"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "mostrar notaciones personalizadas al verificar firmas"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "mostrar URLs del servidor de claves preferido al verificar firmas"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "mostrar validez del ID de usuario al verificar firmas"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "mostrar IDs de usuario revocados y caducados al verificar firmas"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "mostrar solo ID primario de usuario al verificar firmas"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "validar firmas con datos PKA"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "aumentar confianza en las firmas con datos v�lidos PKA"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "opciones de verificaci�n inv�lidas\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "imposible establecer camino de ejecutables %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "lista de auto-localizaci�n de claves inv�lida\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATENCI�N: �el programa podr�a volcar un fichero core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sustituye a %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s no permitido con %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s no tiene sentido con %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "no se ejecutar� en memoria insegura por %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s�lo puede hacer firmas separadas o en claro en modo --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "no puede firmar y cifrar a la vez en modo --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "debe usar ficheros (no tuber�as) si trabaja con --pgp2 activo.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar un mensaje en modo --pgp2 requiere el algoritmo IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "el algoritmo de cifrado seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "el algoritmo de resumen seleccionado no inv�lido\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "el algoritmo de compresi�n seleccionado es inv�lido\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "el algoritmo de certificaci�n por resumen elegido es inv�lido\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser mayor que 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser mayor que 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe estar en el rango de 1 a 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level inv�lido; debe ser 0, 1, 2, � 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: el modo S2K simple (0) no es nada recomendable\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K incorrecto; debe ser 0, 1 o 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto inv�lidas\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias personales de cifrado inv�lidas\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias personales de algoritmo de resumen inv�lidas\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias personales de compresi�n inv�lidas\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s a�n no funciona con %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el cifrado `%s' en modo %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "no puede usar el resumen `%s' en modo %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "no puede usar la compresi�n `%s' en modo %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicializaci�n de la base de datos de confianza fallida: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "AVISO: se indicaron receptores (-r) sin clave p�blica de cifrado\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nombre_fichero]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "el cifrado sim�trico de `%s' fall�: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "no puede usar --symetric --encrypt en modo %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nombre_fichero]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nombre_fichero]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "no puede usar --symetric --sign --encrypt con --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "no puede usar --symmetric --sign --encrypt en modo %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nombre_fichero]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nombre_fichero]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nombre_fichero]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usuario"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usuario [�rdenes]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-usuario"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "env�o al servidor de claves fallido: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recepci�n del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "exportaci�n de clave fallida: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "b�squeda del servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "renovaci�n al servidor de claves fallida: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creaci�n de armadura fallida: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de distribuci�n inv�lido `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nombre_fichero]"
 
@@ -2718,19 +2723,19 @@ msgstr "[nombre_fichero]"
 # En espa�ol no se deja espacio antes de los puntos suspensivos
 # (Real Academia dixit) :)
 # Tomo nota :-). Este comentario d�jalo siempre.
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Adelante, teclee su mensaje...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL de pol�tica de certificado inv�lida\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL de pol�tica inv�lida\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "la URL del servidor de claves preferido no es v�lida\n"
 
@@ -2885,7 +2890,7 @@ msgstr "    firmas limpiadas: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      IDs de usuario limpiados: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2894,329 +2899,334 @@ msgstr ""
 "AVISO: la clave %s contiene preferencias para algoritmos\n"
 "no disponibles en estos IDs de usuario:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": algoritmo de cifrado preferido %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": algoritmo de resumen preferido %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": algoritmo de compresi�n preferido %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "se recomienda encarecidamente que actualice sus preferencias y\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "re-dustribuya esta clave para evitar potenciales problemas de\n"
 "diferencias en los algoritmos.\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "puede actualizar sus preferencias con: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "clave %s: sin identificador de usuario\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "clave %s: reparada la subclave PKS corrompida\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "clave %s: aceptado ID de usuario sin autofirma \"%s\"\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "clave %s: sin identificadores de usuario v�lidos\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "esto puede ser debido a la ausencia de autofirma\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "clave %s: clave p�blica no encontrada: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "clave %s: clave nueva - omitida\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "anillo de claves no escribible encontrado: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribiendo en `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "error escribiendo anillo `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "clave %s: clave p�blica \"%s\" importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "clave %s: no coincide con nuestra copia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "clave %s: no puede localizarse el bloque de claves original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "clave %s: no puede leerse el bloque de claves original: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "clave %s: \"%s\" 1 ID de usuario nuevo\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "clave %s: \"%s\" %d nuevos identificadores de usuario\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "clave %s: \"%s\" 1 firma nueva\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "clave %s: \"%s\" %d firmas nuevas\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "clave %s: \"%s\" 1 subclave nueva\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "clave %s: \"%s\" %d subclaves nuevas\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "clave %s: \"%s\" %d firmas limpiadas\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "clave %s: \"%s\" %d identificador de usuario limpiado\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "clave %s: \"%s\" %d identificadores de usuario limpiados\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "clave %s: \"%s\" sin cambios\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "clave %s: clave secreta con cifrado inv�lido %d - omitida\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "no se permite importar claves secretas\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "no hay anillo secreto de claves por defecto: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "clave %s: clave secreta importada\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "clave %s: ya estaba en el anillo secreto\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "clave %s: clave secreta no encontrada: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "clave %s: falta la clave p�blica - imposible emplear el\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "clave %s: certificado de revocaci�n inv�lido: %s - rechazado\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "clave %s: no hay identificador de usuario para la firma\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible para ID \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "clave %s: autofirma inv�lida para el id \"%s\"\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "clave %s: no hay subclave que unir a la clave\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "clave %s: algoritmo de clave p�blica no disponible\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "clave %s: firma directa de clave a�adida\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "clave %s: no hay subclave que unir a la clave\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "clave %s: uni�n de subclave inv�lida\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "clave %s: borrado enlace de subclaves m�ltiples\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "clave %s: no hay subclave para la revocaci�n de clave\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "clave %s: revocaci�n de subclave inv�lida\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "clave %s: borrada revocaci�n de subclave m�ltiple\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "clave %s: omitido ID de usuario \"%s\"\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "clave %s: subclave omitida\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "clave %s: firma no exportable (clase 0x%02x) - omitida\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "clave %s: certificado de revocaci�n en lugar equivocado - omitido\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "clave %s: certificado de revocaci�n no valido: %s - omitido\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "clave %s: firma de subclave en lugar equivocado - omitida\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "clave %s: firma de clase (0x%02x) inesperada - omitida\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "clave %s: detectado usuario duplicado - fusionada\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: recuperando clave de revocaci�n %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: la clave %s puede estar revocada: falta clave de revocaci�n %s.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "clave %s: \"%s\" certificado de revocaci�n a�adido\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "clave %s: firma directa de clave a�adida\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTA: un S/N de la clave no coincide con la de la tarjeta\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTA: clave primaria en l�nea y almacenada en la tarjeta\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTA: clave secundaria en l�nea y almacenada en la tarjeta\n"
 
@@ -3326,12 +3336,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "ID de usuario \"%s\" revocado."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Seguro que todav�a quiere firmarlo? (s/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Imposible firmar.\n"
 
@@ -3516,8 +3526,8 @@ msgstr "He comprobado esta clave meticulosamente.\n"
 msgid "Really sign? (y/N) "
 msgstr "�Firmar de verdad? (s/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallida: %s\n"
@@ -3573,180 +3583,180 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Realmente quiere hacer esto? (s/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "moviendo la firma de la clave al lugar correcto\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "graba y sale"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "muestra huella dactilar de la clave"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "lista clave e identificadores de usuario"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "selecciona identificador de usuario N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "selecciona subclave N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "comprueba firmas"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "firmar IDs seleccionadas [* ver debajo �rdenes relacionadas]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "firma localmente los IDs de usuarios elegidos"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "firmar IDs seleccionados con firma de confianza"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "firmar IDs seleccionados con firma no revocable"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "a�adir un identificador de usuario"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "a�adir un ID fotogr�fico"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "borrar identificadores de usuario seleccionados"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "a�adir una subclave"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "a�adir clave a tarjeta"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "mover una clave a la tarjeta"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "mover una clave de respaldo a la tarjeta"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "borrar clave secundaria"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "a�adir una clave de revocaci�n"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "borrar firmas de los ID seleccionados"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "cambiar la fecha de caducidad para la clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "marcar ID de usuario seleccionado como primario"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre lista de claves secretas y p�blicas"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "mostrar preferencias (experto)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "mostrar preferencias (prolijo)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "establecer preferencias para todos los ID seleccionados"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "establecer URL del servidor de claves preferido por los IDs elegidos"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "establecer notaci�n para los IDs de usuario seleccionados"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "cambia la frase contrase�a"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "cambia valores de confianza"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "revocar firmas de los identificadores seleccionados"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "revocar los identificadores seleccionados"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "revoca clave o subclaves seleccionadas"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "habilita clave"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "deshabilita clave"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "mostrar fotos de los ID seleccionados"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "compactar IDs inutilizables y borrar firmas inutilizables de la clave"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "compactar IDs inutilizables y borrar todas las firmas de la clave"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "error leyendo bloque de clave secreta \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Clave secreta disponible.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Se necesita la clave secreta para hacer esto.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor use la orden \"cambia\" primero.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3757,227 +3767,227 @@ msgstr ""
 "locales (lsign), una 't' para firmas fiables (tsign), `nr' para firmas no\n"
 "revocables (nrsign) o cualquier combinaci�n de ellas (ltsign, tnrsign, etc)\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "La clave est� revocada."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Firmar realmente todos los IDs de usuario? (s/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugerencia: seleccione los identificadores de usuario que firmar\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Clase de firma desconocida `%s'\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Esta orden no se permite en modo %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar por lo menos un identificador de usuario.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "�No puede borrar el �ltimo identificador de usuario!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Borrar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Borrar realmente este identificador de usuario? (s/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Borrar FIXME la clave primaria? (s/N)"
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar exactamente una clave.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "La orden espera un nombre de fichero como argumento\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "No se puede abrir `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Error leyendo clave de respaldo desde `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar por lo menos una clave.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�De verdad quiere borrar las claves seleccionadas? (s/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�De verdad quiere borrar esta clave? (s/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Revocar realmente todos los identificadores seleccionados? (s/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Revocar realmente este identificador de usuario? (s/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�De verdad quiere revocar la clave completa? (s/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�De verdad quiere revocar las subclaves seleccionadas? (s/N)"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�De verdad quiere revocar esta subclave? (s/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "La confianza del propietario no puede establecerse si se est� usando\n"
 "una base de datos de confianza propocionada por el usuario\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Establecer lista de preferencias a:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Actualizar realmente las preferencias para los ID seleccionados? (s/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "�Actualizar realmente las preferencias? (s/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "�Grabar cambios? (s/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "�Salir sin grabar? (s/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizaci�n fallida: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizaci�n de la clave secreta fallida: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Clave sin cambios, no se necesita actualizaci�n.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Resumen: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Sevidor de claves no-modificar"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Servidor de claves preferido: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Notaciones: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "No hay preferencias en un identificador de usuario estilo PGP 2.x\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta clave fue revocada en %s por %s clave %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta clave puede ser revocada por %s clave %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(confidencial)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "creado: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revocada: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "caduc�: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "caduca: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "confianza: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "validez: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Esta clave est� deshabilitada"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "num. tarjeta: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3985,17 +3995,17 @@ msgstr ""
 "Por favor, advierta que la validez de clave mostrada no es necesariamente\n"
 "correcta a menos de que reinicie el programa.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revocada"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "caducada"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4003,7 +4013,7 @@ msgstr ""
 "AVISO: ning�n ID de usuario est� marcado como principal. Esta orden puede\n"
 "       causar que se tome como principal por defecto otro ID de usuario.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4012,74 +4022,74 @@ msgstr ""
 "AVISO: esta es una clave de tipo PGP2. A�adir un ID fotogr�fico puede\n"
 "hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de querer a�adirla? (s/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "No puede a�adir un ID fotogr�fico a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta firma correcta? (s/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta firma inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta firma desconocida? (s/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Borrar realmente esta autofirma? (s/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d firmas borradas.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d firmas borradas\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "No se borr� nada\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "inv�lida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID de usuario \"%s\" compactado: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID de usuario \"%s\": %d firma borrada\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID de usuario \"%s\": %d firmas borradas\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID de usuario \"%s\": ya minimizado\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID de usuario \"%s\" ya limpiado\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4088,193 +4098,193 @@ msgstr ""
 "AVISO: esta es una clave tipo PGP2. A�adir un revocador designado puede\n"
 "       hacer que algunas versiones de PGP rechacen esta clave.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "No puede a�adir un revocador designado a una clave tipo PGP2.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduzca el ID de usuario del revocador designado: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "no se puede elegir una clave tipo PGP 2.x como revocador designado\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "no puede elegir una clave como su propio revocador designado\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "esta clave ya ha sido designada como revocadora\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "�AVISO: no podr� deshacer la elecci�n de clave como revocador designado!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de querer elegir esta clave como revocador designado? (s/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite las selecciones de las claves secretas.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo una clave secundaria.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando fecha de caducidad de subclave.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando caducidad de clave primaria.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "No puede cambiar la fecha de caducidad de una clave v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "No existe la firma correspondiente en el anillo secreto\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "la subclave de firmado %s ya est� certificada en cruz\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "la subclave %s no firma y as� no necesita ser certificada en cruz\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Por favor seleccione exactamente un identificador de usuario.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitiendo autofirma V3 para el id \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduzca la URL de su servidor de claves preferido: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Seguro que quiere reemplazarlo? (s/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Seguro que quiere borrarlo? (s/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Introduzca la notaci�n: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "�Continuar? (s/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "No hay ning�n identificador de usuario con el �ndice %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "No hay ID de usuario con hash %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "No existe una subclave con �ndice %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \"%s\"\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "firmada con su clave %s el %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (no exportable)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta firma caduc� el %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�De verdad quiere revocarla? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta clave? (s/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Ha firmado estos IDs de usuario con la clave %s:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (no revocable)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocada por la clave %s el %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Va a revocar las siguientes firmas:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Crear los certificados de revocaci�n realmente? (s/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "no hay clave secreta\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID de usuario \"%s\" ya ha sido revocado\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "AVISO: un ID de usuario tiene fecha %d segundos en el futuro\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La clave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La subclave %s ya ha sido revocada.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Mostrando ID fotogr�fico %s de tama�o %ld para la clave %s (uid %d)\n"
@@ -5416,12 +5426,12 @@ msgstr "AVISO: las opciones en `%s' no est�n a�n activas en esta ejecuci�n\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "no puedo manejar el algoritmo de clave p�blica %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: clave de sesi�n cifrada sim�tricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "el subpaquete de tipo %d tiene el bit cr�tico activado\n"
@@ -5806,28 +5816,28 @@ msgstr "Nota: clave %s no tiene preferencias para %s\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "datos no grabados; use la opci�n \"--output\" para grabarlos\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Firma separada.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Introduzca el nombre del fichero de datos: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "leyendo stdin...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "no hay datos firmados\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposible abrir datos firmados `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposible abrir datos firmados fd=%d: %s\n"
diff --git a/po/et.po b/po/et.po
index a6922feba..fe3c3594b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2004-06-17 11:04+0300\n"
 "Last-Translator: Toomas Soome <[email protected]>\n"
 "Language-Team: Estonian <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "`%s' ei �nnestu luua: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -327,7 +327,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuda parooli"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -338,107 +338,107 @@ msgstr ""
 "V�tmed:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "ole jutukas"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ole m�nev�rra vaiksem"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FAIL|lae laiendusmoodul FAIL"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "otsi v�tmeid v�tmeserverist"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "uuenda usalduse andmebaasi"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -446,158 +446,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Palun saatke veateated aadressil <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kasuta: gpg [v�tmed] [failid] (-h n�itab abiinfot)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "M�RKUS: vaikimisi v�tmete fail `%s' puudub\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "v�tmete fail `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "loen v�tmeid failist `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kataloogi `%s' ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "viga parooli loomisel: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "viga teate saatmisel serverile `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: kataloog on loodud\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: lugemine eba�nnestus (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: kataloogi ei �nnestu luua: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: j�tsin vahele: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent ei ole sesses sessioonis kasutatav\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vigane GPG_AGENT_INFO keskkonnamuutuja\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -805,7 +805,7 @@ msgstr "viga parooli loomisel: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "faili ei �nnestu avada: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -820,7 +820,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "viga salajase v�tme v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -830,7 +830,7 @@ msgstr "viga `%s' lugemisel: %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "viga `%s' lugemisel: %s\n"
@@ -944,11 +944,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1200,47 +1205,47 @@ msgstr "ootamatu pakend:"
 msgid "invalid dash escaped line: "
 msgstr "vigane kriipsudega m�rgitud rida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "vigane radix64 s�mbol %02x vahele j�etud\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "enneaegne failil�pp (puudub CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "enneaegne failil�pp (poolik CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "vigane CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC viga; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "enneaegne failil�pp (l�petaval real)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "viga l�petaval real\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "ei leia OpenPGP andmeid.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "vigane pakend: rida on pikem, kui %d s�mbolit\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1285,7 +1290,7 @@ msgstr "salajane v�ti ei ole k�ttesaadav"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1570,7 +1575,7 @@ msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 msgid "error writing key to card: %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "v�lju sellest men��st"
 
@@ -1579,7 +1584,7 @@ msgstr "v�lju sellest men��st"
 msgid "show admin commands"
 msgstr "vastuolulised k�sud\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "n�ita seda abiinfot"
 
@@ -1659,7 +1664,7 @@ msgstr "vastuolulised k�sud\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Vigane k�sklus (proovige \"help\")\n"
 
@@ -1667,18 +1672,18 @@ msgstr "Vigane k�sklus (proovige \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "v�ti --output ei t��ta selle k�suga\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1971,7 +1976,7 @@ msgstr ""
 "Vigane v�ti %08lX muudeti kehtivaks v�tme --allow-non-selfsigned-uid "
 "kasutamisega\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "avalikul alamv�tmel %08lX puudub salajane alamv�ti - ignoreerin\n"
@@ -2213,7 +2218,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Avalik v�ti: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "�iffer: "
 
@@ -2221,7 +2226,7 @@ msgstr "�iffer: "
 msgid "Hash: "
 msgstr "R�si: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Pakkimine: "
 
@@ -2363,408 +2368,408 @@ msgstr "M�RKUS: ignoreerin vana vaikimisi v�tmete faili `%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "M�RKUS: %s ei ole tavap�raseks kasutamiseks!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "vigased impordi v�tmed\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei ole lubatud kooditabel\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path v��rtuseks ei �nnestu seada %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: vigased ekspordi v�tmed\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "HOIATUS: programm v�ib salvestada oma m�lupildi!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "HOIATUS: %s m��rab �le %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s ei ole koos lubatud!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s ei oma koos m�tet!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "--pgp2 moodis saate luua ainult eraldiseisvaid v�i avateksti allkirju\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 moodis ei saa korraga allkirjastada ja kr�pteerida\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 moodis peate kasutama faile (ja mitte toru).\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "teate kr�pteerimine --pgp2 moodis n�uab IDEA �iffrit\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valitud l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valitud �ifri algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valitud sertifikaadi l�hendi algoritm ei ole lubatud\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed peab olema suurem, kui 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed peab olema suurem, kui 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth peab olema vahemikus 1 kuni 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "vigane vaikimisi-sert-tase; peab olema 0, 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "vigane min-sert-tase; peab olema 1, 2 v�i 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "M�RKUS: lihtne S2K mood (0) ei soovitata kasutada\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "vigane S2K mood; peab olema 0, 1 v�i 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "vigased vaikimisi eelistused\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "vigased isikliku �ifri eelistused\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "vigased isikliku l�hendi eelistused\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "vigased isikliku pakkimise eelistused\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ei t��ta veel koos %s-ga\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�ifri algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "s�numil�hendi algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkimise algoritm \"%s\" ei ole moodis %s lubatud\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB initsialiseerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "HOIATUS: m��rati saajad (-r) aga ei kasutata avaliku v�tme kr�ptograafiat\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [failinimi]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [failinimi]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "lahtikr�pteerimine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [failinimi]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [failinimi]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [failinimi]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s ei ole moodis %s lubatud.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [failinimi]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [failinimi]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [failinimi]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kasutaja-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kasutaja-id [k�sud]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key kasutaja-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "v�tmeserverile saatmine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "v�tmeserverilt lugemine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "v�tme eksport eba�nnestus: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "v�tmeserveri otsing eba�nnestus: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "v�tmeserveri uuendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "lahtipakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "pakendamine eba�nnestus: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "vigane r�sialgoritm `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[failinimi]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjutage n��d oma teade ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "antud sertifikaadi poliisi URL on vigane\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "antud allkirja poliisi URL on vigane\n"
@@ -2920,336 +2925,341 @@ msgstr "         uusi allkirju: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr " loetud salajasi v�tmeid: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s allkiri, s�numil�hendi algoritm %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "v�ti %08lX: kasutaja ID puudub\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "v�ti %08lX: HKP alamv�tme rike parandatud\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "v�ti %08lX: aktsepteerisin iseenda poolt allakirjutamata kasutaja ID '%s'\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "v�ti %08lX: puudub kehtiv kasutaja ID\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "see v�ib olla p�hjustatud puuduvast iseenda allkirjast\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "v�ti %08lX: avalikku v�tit ei leitud: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "v�ti %08lX: uus v�ti - j�tsin vahele\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ei leia kirjutatavat v�tmehoidlat: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjutan faili `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "viga v�tmehoidlasse `%s' kirjutamisel: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "v�ti %08lX: avalik v�ti \"%s\" on imporditud\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "v�ti %08lX: ei sobi meie koopiaga\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "v�ti %08lX: ei leia algset v�tmeblokki: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "v�ti %08lX: ei �nnestu lugeda algset v�tmeblokki: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus kasutaja ID\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus allkiri\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "v�ti %08lX: \"%s\" 1 uus alamv�ti\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "v�ti %08lX: \"%s\" %d uut alamv�tit\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut allkirja\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "v�ti %08lX: \"%s\" %d uut kasutaja IDd\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "v�ti %08lX: \"%s\" ei muudetud\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "v�ti %08lX: salajane v�ti vigase �ifriga %d - j�tsin vahele\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjutan salajase v�tme faili `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "puudub salajaste v�tmete vaikimisi v�tmehoidla: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "v�ti %08lX: salajane v�ti on imporditud\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "v�ti %08lX: on juba salajaste v�tmete hoidlas\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "v�ti %08lX: salajast v�tit ei leitud: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "v�ti %08lX: avalik v�ti puudub - t�histamise sertifikaati ei saa rakendada\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - l�kkasin tagasi\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat imporditud\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "v�ti %08lX: allkirjal puudub kasutaja ID\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm kasutajaga \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "v�ti %08lX: kasutajal \"%s\" on vigane iseenda allkiri\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "v�ti %08lX: mittetoetatud avaliku v�tme algoritm\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "v�ti %08lX: v�tmeseosel puudub alamv�ti\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "v�ti %08lX: vigane alamv�tme seos\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "v�ti %08lX: vigane mitme alamv�tme seos\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "v�ti %08lX: v�tme t�histamiseks puudub alamv�ti\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "v�ti %08lX: vigane alamv�tme t�histamine\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "v�ti %08lX: eemaldasin mitme alamv�tme t�histamise\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "v�ti %08lX: j�tsin vahele kasutaja ID '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "v�ti %08lX: j�tsin alamv�tme vahele\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "v�ti %08lX: mitte eksporditav allkiri (klass %02x) - j�tan vahele\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "v�ti %08lX: t�histamise sertifikaat on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "v�ti %08lX: vigane t�histamise sertifikaat: %s - j�tan vahele\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "v�ti %08lX: alamv�tme allkiri on vales kohas - j�tan vahele\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "v�ti %08lX: ootamatu allkirja klass (0x%02x) - j�tan vahele\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "v�ti %08lX: tuvastasin dubleeritud kasutaja ID - mestisin\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: laen t�histamise v�tit %08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "HOIATUS: v�ti %08lX v�ib olla t�histatud: t�histamise v�tit %08lX pole.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "v�ti %08lX: \"%s\" t�histamise sertifikaat lisatud\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "v�ti %08lX: lisatud vahetu v�tme allkiri\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "avalik v�ti ei sobi salajase v�tmega!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "j�tsin vahele: avalik v�ti on juba olemas\n"
@@ -3358,12 +3368,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka allkirjastada? (j/e) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Ei saa allkirjastada.\n"
 
@@ -3574,8 +3584,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Allkirjastan t�esti? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allkirjastamine eba�nnestus: %s\n"
@@ -3631,201 +3641,201 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Kas te t�esti soovite seda teha? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "t�stan v�tme allkirja �igesse kohta\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "salvesta ja v�lju"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "n�ita s�rmej�lge"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "n�ita v�tit ja kasutaja IDd"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "vali kasutaja ID N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "t�hista allkirjad"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allkirjasta v�ti lokaalselt"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "lisa kasutaja ID"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "lisa foto ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "kustuta kasutaja ID"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "kustuta sekundaarne v�ti"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "lisa t�histamise v�ti"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "m�rgi kasutaja ID primaarseks"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "l�lita salajaste v�i avalike v�tmete loendi vahel"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "n�ita eelistusi (ekspert)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "n�ita eelistusi (detailsena)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "ei saa parsida v�tmeserveri URI\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "muuda parooli"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "muuda omaniku usaldust"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "t�hista kasutaja ID"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "t�hista sekundaarne v�ti"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "luba v�ti"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "blokeeri v�ti"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "n�ita foto ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "viga salajase v�tmebloki `%s' lugemisel: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Salajane v�ti on kasutatav.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Selle tegamiseks on vaja salajast v�tit.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Palun kasutage k�igepealt k�sku \"toggle\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3833,242 +3843,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "V�ti on t�histatud."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Kas allkirjastan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valige allkirjastamiseks kasutaja\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tundmatu allkirja klass"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "See k�sklus ei ole %s moodis lubatud.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Te peate valima v�hemalt �he kasutaja ID.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Viimast kasutaja ID ei saa kustutada!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Kas kustutan t�esti k�ik kasutaja IDd? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Kas eemaldan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' ei �nnestu avada: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "viga v�tmehoidla `%s' loomisel: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Te peata valima v�hemalt �he v�tme.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid kustutada? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit kustutada? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Kas t�histan t�esti k�ik valitud kasutaja IDd? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Kas t�histan t�esti selle kasutaja ID? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Kas te t�esti soovite valitud v�tmeid t�histada? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Kas te t�esti soovite seda v�tit t�histada? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "sea eelistuste nimekiri"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Kas uuendan t�esti k�ik kasutaja ID-de seaded? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Kas t�esti uuendan seaded? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvestan muutused? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "V�ljun salvestamata? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salajase v�tme uuendamine eba�nnestus: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "V�tit ei muudetud, seega pole uuendamist vaja.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Teatel�hend: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Omadused: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Noteering: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x stiilis kasutaja ID ei oma seadeid.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Selle v�tme v�ib olla t�histanud %s v�ti "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (tundlik)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s ei �nnestu luua: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [aegub: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " usaldus: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "See v�ti on blokeeritud"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4076,19 +4086,19 @@ msgstr ""
 "Tuleb t�hele panna et kuni te pole programmi uuesti k�ivitanud, ei pruugi\n"
 "n�idatud v�tme kehtivus olla tingimata korrektne.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[t�histatud] "
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4096,7 +4106,7 @@ msgstr ""
 "HOIATUS: �htegi kasutaja ID pole m�rgitud primaarseks.  See k�sklus v�ib\n"
 "              p�hjustada muu kasutaja ID primaarseks m��ramist.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4105,75 +4115,75 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. Foto ID lisamine v�ib sundida m�ningaid\n"
 "         PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka lisada? (j/E) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Foto IDd ei saa PGP2 v�tmele lisada.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Kustutan selle korrektse allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Kustutan selle vigase allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Kustutan selle tundmatu allkirja? (j/E/v)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Kas t�esti kustutan selle iseenda allkirja? (j/E)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Kustutatud %d allkiri.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Kustutatud %d allkirja.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Midagi ei kustutatud.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "vigane pakend"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kasutaja ID \"%s\" on t�histatud."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4182,202 +4192,202 @@ msgstr ""
 "HOIATUS: See on PGP2-stiilis v�ti. M��ratud t�histaja lisamine v�ib\n"
 "         p�hjustada m�ningaid PGP versioone seda v�tit tagasi l�kkama.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x-stiili v�tmele ei saa m��ratud t�histajat lisada.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Sisestage m��ratud t�histaja kasutaja ID: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x stiilis v�tit ei saa nimetada m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "te ei saa nimetada v�tit iseenda m��ratud t�histajaks\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "HOIATUS: See v�ti on m��ratud t�histaja poolt t�histatud!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "HOIATUS: v�tme seadmist m��ratud t�histajaks ei saa tagasi v�tta!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Olete kindel, et soovite seda v�tit seada m��ratud t�histajaks? (j/E): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Palun eemaldage salajastelt v�tmetelt valikud.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "palun valige �limalt �ks sekundaarne v�ti.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muudan sekundaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muudan primaarse v�tme aegumise aega.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3 v�tme aegumise aega ei saa muuta.\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Vastavat allkirja salajaste v�tmete hoidlas pole\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "HOIATUS: allkirjastamise alamv�ti %08lX ei ole rist-sertifitseeritud\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Palun valige t�pselt �ks kasutaja ID.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "j�tan kasutaja \"%s\" v3 iseenda allkirja vahele\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Olete kindel, et soovite seda kasutada (j/E)? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allkirja noteerimine: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Kirjutan �le (j/E)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Kasutaja ID numbriga %d puudub\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "kasutaja ID: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   allkirjastanud %08lX %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "See allkiri aegub %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Olete kindel, et soovite seda ikka t�histada? (j/E) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Loon sellele allkirjale t�histamise sertifikaadi? (j/E) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   allkirjastanud %08lX %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te olete allkirjastanud j�rgnevad kasutaja IDd:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (mitte-eksporditav)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   t�histanud %08lX %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Te asute t�histama j�rgmisi allkirju:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Kas t�esti loon t�histamise sertifikaadid? (j/E) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "salajast v�tit pole\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "HOIATUS: kasutaja ID allkirja ajatempel on %d sekundit tulevikus\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "kasutaja ID \"%s\" on juba t�histatud\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "N�itan %s foto IDd suurusega %ld, v�ti 0x%08lX (uid %d)\n"
@@ -5524,13 +5534,13 @@ msgstr "HOIATUS: seaded failis `%s' pole seekord veel aktiivsed\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "ei oska k�sitleda avaliku v�tme algoritmi %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "HOIATUS: t�en�oliselt ebaturvaline s�mmeetriliselt kr�pteeritud sessiooni "
 "v�ti\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "alampaketil t��biga %d on kriitiline bitt seatud\n"
@@ -5917,28 +5927,28 @@ msgstr "v�ti %08lX: kasutaja ID puudub\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "andmeid ei salvestatud; salvestamiseks kasutage v�tit \"--output\"\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Eraldiseisev allkiri.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Palun sisestage andmefaili nimi: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "loen standardsisendit ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "allkirjastatud andmeid pole\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allkirjastatud andmete avamine eba�nnestus `%s'\n"
diff --git a/po/fi.po b/po/fi.po
index 34acc27bf..1e450b7d9 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2004-06-16 22:40+0300\n"
 "Last-Translator: Tommi Vainikainen <[email protected]>\n"
 "Language-Team: Finnish <[email protected]>\n"
@@ -137,7 +137,7 @@ msgstr "tiedostoa \"%s\" ei voi luoda: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -343,7 +343,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muuta salasanaa"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -354,107 +354,107 @@ msgstr ""
 "Valitsimet:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "monisanainen"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ole jonkinverran hiljaisempi"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|TIEDOSTO|lataa laajennusmoduuli TIEDOSTO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "etsi avaimia avainpalvelimelta"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "päivitä luottamustietokanta"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -463,158 +463,158 @@ msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Käyttö: gpg [valitsimet] [tiedostot] (-h näyttää ohjeen)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "HUOM: Ei oletusasetustiedostoa \"%s\"\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "asetustiedosto \"%s\": %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "luetaan asetukset tiedostosta \"%s\"\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "hakemiston \"%s\" luominen ei onnistu: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "virhe luotaessa salasanaa: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "virhe lähettäessä kohteeseen \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: hakemisto luotu\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: luku epäonnistui (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: hakemistoa ei voi luoda: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ohitettu: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO-ympäristömuuttuja on väärin muotoiltu\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -822,7 +822,7 @@ msgstr "virhe luotaessa salasanaa: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "ei voi avata tiedostoa: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -837,7 +837,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "virhe kirjoitettaessa salaiseen avainrenkaaseen \"%s\": %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -847,7 +847,7 @@ msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "virhe luettaessa tiedostoa \"%s\": %s\n"
@@ -961,11 +961,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1217,47 +1222,47 @@ msgstr "odottamaton ascii-koodaus:"
 msgid "invalid dash escaped line: "
 msgstr "epäkelpo viiva rivin lopussa: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "epäkelpo radix64-merkki %02x ohitettu\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (ei CRC:tä)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "ennenaikainen tiedoston loppu (CRC:ssä)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "väärinmuotoiltu CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-virhe; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Ennenaikainen tiedoston loppu (Trailerissa)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "virhe trailer-rivissä\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "kelvollista OpenPGP-dataa ei löytynyt.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "epäkelpo ascii-koodaus: yli %d merkkiä pitkä rivi\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1304,7 +1309,7 @@ msgstr "salaista avainta ei löydy"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1589,7 +1594,7 @@ msgstr "ohitetaan: salainen avain on jo paikalla\n"
 msgid "error writing key to card: %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "ulos tästä valikosta"
 
@@ -1598,7 +1603,7 @@ msgstr "ulos tästä valikosta"
 msgid "show admin commands"
 msgstr "ristiriitainen komento\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "näytä tämä ohje"
 
@@ -1678,7 +1683,7 @@ msgstr "ristiriitainen komento\n"
 msgid "Admin commands are not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komento ei kelpaa (kirjoita \"help\")\n"
 
@@ -1686,18 +1691,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1987,7 +1992,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Epäkelpo avain %08lX hyväksytty valitsimella --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ei salaista aliavainta julkiselle aliavaimelle %08lX - ohitetaan\n"
@@ -2232,7 +2237,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "JulkAvain: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Salaus: "
 
@@ -2240,7 +2245,7 @@ msgstr "Salaus: "
 msgid "Hash: "
 msgstr "Tiiviste: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Pakkaus: "
 
@@ -2382,409 +2387,409 @@ msgstr "HUOM: Vanhat oletusarvoiset asetukset löytyvät tiedostosta \"%s\"\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "HUOM: %s ei ole normaaliin käyttöön!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "virheelliset tuontivalitsimet\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s ei kelpaa merkistöksi\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-polkua kohteeseen %s ei voi asettaa\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: virheelliset vientivalitsimet\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROITUS: ohjelma voi luoda core-tiedoston!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROITUS: %s korvaa %s:n\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ja %s eivät ole sallittuja yhdessä!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ja %s yhdessä on järjetöntä!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "erillisen allekirjoituksen voi luoda vain --pgp2-tilassa\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2-tilassa ei voi allekirjoittaa ja salata samanaikaisesti\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "sinun tulee käyttää tiedostoja (eikä putkitusta) kun --pgp2 on käytössä.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "viestin salaaaminen --pgp2-tilassa vaatii IDEA-salaimen\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valittu tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "valittu salausalgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valittu varmenteen tiivistealgoritmi ei kelpaa\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed täytyy olla suurempi kuin 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed täytyy olla suurempi kuin 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth tulee olla välillä 1-255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level ei kelpaa; täytyy olla 0, 1, 2 tai 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level ei kelpaa; täytyy olla 1, 2 tai 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr ""
 "HUOM: yksinkertaista S2K-tilaa (0) ei todellakaan suositella käytettäväksi\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "virheellinen S2K-tila; täytyy olla 0, 1 tai 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "virheelliset oletusarvoiset valinnat\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "virheelliset henkilökohtaisen salaimen valinnat\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "virheelliset henkilökohtaiset tiivisteen valinnat\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "virheelliset henkilökohtaiset pakkausvalinnat\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ja %s eivät vielä toimi yhdessä\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "salausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "tiivistealgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "pakkausalgoritmia \"%s\" ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "TrustDB:n alustaminen ei onnistu: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROITUS: vastaanottajia (-r) annettu käyttämättä julkisen avaimen salausta\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [tiedostonimi]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "avaus epäonnistui: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--allekirjoita [tiedostonimi]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [tiedostonimi]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "valitsinta %s ei voi käyttää %s-tilassa\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [tiedostonimi]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [tiedostonimi]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [tiedostonimi]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key käyttäjätunnus"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key käyttäjätunnus [komennot]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key käyttäjätunnus"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "avainpalvelimelle lähettäminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "avainpalvelimelta vastaanotto epäonnistui: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "avaimen vienti epäonnistui: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "avainpalvelimelta etsiminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "avainpalvelimen päivitys epäonnistui: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ascii-koodauksen purku epäonnistui: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ascii-koodaaminen epäonnistui: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "virheellinen tiivistealgoritmi \"%s\"\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[tiedostonimi]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Kirjoita viestisi...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "annettu varmennekäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "annettu allekirjoituskäytännön URL on virheellinen\n"
@@ -2940,339 +2945,344 @@ msgstr "        uusia allekirjoituksia: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      luettuja salaisia avaimia: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
 # Ensimmäinen %s on binary, textmode tai unknown, ks. alla
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%sallekirjoitus, tiivistealgoritmi %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "avain %08lX: ei käyttäjätunnusta\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "avain %08lX: HKP-aliavainvirhe korjattu\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "avain %08lX: käyttäjätunnus \"%s\" hyväksytty ilman omaa allekirjoitusta\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "avain %08lX: ei voimassaolevia käyttäjätunnuksia\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "tämän voi aiheuttaa puuttuva oma-allekirjoitus\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "avain %08lX: julkista avainta ei löydetty: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "avain %08lX: uusi avain - ohitetaan\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "kirjoitettavissa olevaa avainrengasta ei löydy: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "kirjoitetaan kohteeseen \"%s\"\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "virhe kirjoitettaessa avainrenkaaseen \"%s\": %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "avain %08lX: julkinen avain \"%s\" tuotu\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "avain %08lX: ei vastaa omaa kopiotamme\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "avain %08lX: alkuperäistä avainlohkoa ei löydy: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "avain %08lX. alkuperäisen avainlohko lukeminen ei onnistu: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "avain %08lX: \"%s\" 1 uusi käyttäjätunnus\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "avain %08lX: \"%s\" 1 uusi allekirjoitus\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "avain %08lX: \"%s\" 1 uusi aliavain\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "avain %08lX: \"%s\" %d uutta aliavainta\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta allekirjoitusta\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "avain %08lX: \"%s\" %d uutta käyttäjätunnusta\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "avain %08lX: \"%s\" ei muutoksia\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "avain %08lX: avaimella on epäkelpo salain %d - ohitetaan\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "kirjoitan salaisen avaimen kohteeseen \"%s\"\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "salaiselle avainrenkaalle ei ole asetettu oletusarvoa: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "avain %08lX: salainen avain tuotu\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "avain %08lX: avain on jo avainrenkaassa\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "avain %08lX: salaista avainta ei löydy: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "avain %08lX: ei julkista avainta - mitätöintivarmennetta ei voida käyttää\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "avain %08lX: pätemätön mitätöintivarmenne: %s - hylätty\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "avain %08lX: mitätöintivarmenne \"%s\" tuotu\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "avain %08lX: allekirjoitukselle ei ole käyttäjätunnusta\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia \"%s\" ei tueta\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "avain %08lX: epäkelpo oma-allekirjoitus käyttäjätunnuksella \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "avain %08lX: julkisen avaimen algoritmia ei tueta\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "avain %08lX: ei aliavainta avainten riippuvuuksiin\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "avain %08lX: pätemätön aliavainriippuvuus\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "avain %08lX: moninkertainen aliavainriippuvuus poistettu\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "avain %08lX: ei aliavainta avainten mitätöintiä varten\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "avain %08lX: epäkelpo aliavaimen mitätöinti\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "avain %08lX: useiden aliavainten mitätöinti poistettu\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "avain %08lX: käyttäjätunnus ohitettu '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "avain %08lX: aliavain ohitettu\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr ""
 "avain %08lX: allekirjoitusta ei voida viedä (luokka %02x) - ohitetaan\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "avain %08lX: mitätöintivarmenne väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "avain %08lX: epäkelpo mitätöintivarmenne: %s - ohitetaan\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "avain %08lX: aliavaimen allekirjoitus väärässä paikassa - ohitetaan\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "avain %08lX: odottamaton allekirjoitusluokka (0x%02X) - ohitetaan\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "avain %08lX: käyttäjätunnuksen kaksoiskappale havaittu - liitetty\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: haetaan mitätöintiavain %08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROITUS: avain %08lX saattaa olla mitätöity: mitätöintiavainta %08lX \n"
 "ei saatavilla.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "avain %08lX: \"%s\"-mitätöintivarmenne lisätty\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "avain %08lX: lisättiin suora avainallekirjoitus\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "julkinen avain ei täsmää salaiseen avaimeen!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ohitetaan: salainen avain on jo paikalla\n"
@@ -3382,12 +3392,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Haluatko varmasti edelleen allekirjoittaa? (k/E) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Allekirjoittaminen ei onnistu.\n"
 
@@ -3600,8 +3610,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Varmastiko allekirjoita? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "allekirjoitus epäonnistui: %s\n"
@@ -3657,201 +3667,201 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Haluatko varmasti tehdä tämän? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "siirretään avaimen allekirjoitus oikealle paikalle\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "tallenna ja lopeta"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "näytä sormenjälki"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "näytä avaimet ja käyttäjätunnukset"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "valitse käyttäjätunnus N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "mitätöi allekirjoitus"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "allekirjoita avain paikallisesti"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "lisää käyttäjätunnus"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "lisää valokuva"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "poista käyttäjätunnus"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "poista toissijainen avain"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "lisää mitätöintiavain"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "merkitse käyttäjätunnus ensisijaiseksi"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "vaihda salaisten ja julkisten avainten luettelon välillä"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "näytä valinnat (asiantuntija)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "näytä valinnat (monisanaisesti)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "avainpalvelimen URI:iä ei voi jäsentää\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "muuta salasanaa"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "muuta luottamusastetta"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "mitätöi käyttäjätunnus"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "mitätöi toissijainen avain"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "ota avain käyttöön"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "poista avain käytöstä"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "näytä valokuvatunniste"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "virhe luettaessa salaista avainlohkoa \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Salainen avain on saatavilla.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Tähän tarvitaan salainen avain.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Käytä ensin komentoa \"toggle\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3859,242 +3869,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Avain on mitätöity."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Varmastiko allekirjoita kaikki käyttäjätunnukset?"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Vihje: Valitse allekirjoitettavat käyttäjätunnukset\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "tuntematon allekirjoitusluokka"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tätä komentoa ei sallita %s-tilassa.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Sinun täytyy valita ainakin yksi käyttäjätunnus.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Et voi poistaa viimeistä käyttäjätunnusta!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Varmastiko poista kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Varmastiko poista tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tiedostoa \"%s\" ei voi avata: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "virhe luotaessa avainrengasta \"%s\": %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Sinun täytyy valita ainakin yksi avain.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Haluatko varmasti poistaa valitut avaimet? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Haluatko varmasti poistaa tämän avaimen? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Varmastiko mitätöi kaikki valitut käyttäjätunnukset? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Varmastiko mitätöi tämä käyttäjätunnus? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Haluatko varmasti mitätöidä valitut avaimet? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Haluatko varmasti mitätöidä tämän avaimen? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "näytä valinnat"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Varmastiko päivitä valinnat näille käyttäjätunnuksille? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Varmastiko päivitä valinnat? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Tallenna muutokset? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Lopeta tallentamatta muutoksia?"
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "salaisen päivitys epäonnistui: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Päivitystä ei tarvita, koska avain ei ole muuttunut.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Tiiviste: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Ominaisuudet: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaatio: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x -muodon käyttäjätunnukselle ei ole valintoja.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tämä avain voidaan mitätöidä %s-avaimella "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (luottamuksellinen)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "ei voida luoda kohdetta %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [vanhenee: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " luottamus: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Tämä avain on poistettu käytöstä"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4102,19 +4112,19 @@ msgstr ""
 "Huomioi, että tässä näytetty voimassaolo ei ole välttämättä\n"
 "ajan tasalla jollet käynnistä ohjelmaa uudelleen\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[mitätöity] "
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4122,7 +4132,7 @@ msgstr ""
 "VAROITUS: mitään käyttäjätunnusta ei ole merkitty ensisijaiseksi.  Tämän \n"
 "komennon johdosta eri käyttäjätunnus voi tulla oletetuksi ensisijaiseksi.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4131,75 +4141,75 @@ msgstr ""
 "VAROITUS: Tämä on PGP2-muodon avain.  Valokuvan lisääminen voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Haluatko edelleen varmasti lisätä sen? (k/E) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Et voi lisätä valokuvaa PGP2-muodon avaimeen.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Poistetaanko tämä kelvollinen allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Poistetaanko tämä epäkelpo allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Poistetaanko tämä tuntematon allekirjoitus? (k/E/l)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Varmastiko poista oma-allekirjoitus? (k/E)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d allekirjoitus poistettu.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d allekirjoitusta poistettu.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Mitään ei poistettu.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "virheellinen ascii-koodaus"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Käyttäjätunnus \"%s\" on mitätöity."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4209,204 +4219,204 @@ msgstr ""
 "voi\n"
 "          saada jotkin PGP:n versiot hylkäämään avaimen.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Et voi lisätä määrättyä mitätöijää PGP 2.x -muodon avaimeen.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Syötä määrätyn mitätöijän käyttäjätunnus: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x -avainta ei voi nimetä määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "et voi nimittää avainta sen omaksi määrätyksi mitätöijäksi\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROITUS: Tämän avaimen nimetty mitätöijä on mitätöinyt avaimen!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROITUS: avaimen nimittämistä määrätyksi mitätöijäksi ei voi perua!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Haluatko varmasti nimittää tämän avaimen määrätyksi mitätöijäksi? (k/E): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Poista salaisten avainten valinnat, kiitos.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Valitse korkeintaan yksi toissijainen avain, kiitos.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Muutetaan toissijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Muutetaan ensisijaisen avaimen vanhentumisaikaa.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Et voi muuttaa v3-avainten vanhentumispäivää\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Salaisesta avainrenkaasta ei löydy vastaavaa allekirjoitusta\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROITUS: allekirjoitusaliavain %08lX ei ole ristiinvarmennettu\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Valitse tasan yksi käyttäjätunnus!\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "ohitetaan v3-muodon oma-allekirjoitus käyttäjätunnukselle \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Haluatko varmasti käyttää sitä (k/E)? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Allekirjoitusnotaatio: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ylikirjoita (k/E)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Indeksillä %d ei löydy käyttäjätunnusta\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "käyttäjätunnus: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   %08lX allekirjoitti tämän %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Tämä allekirjoitus vanheni %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Haluatko varmasti mitätöidä sen? (k/E) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Luodaanko tälle alekirjoitukselle mitätöintivarmenne? (k/E) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   %08lX allekirjoitti tämän %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Olet allekirjoittanut seuraavat käyttäjätunnukset:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (vientiin kelpaamaton)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   %08lX mitätöi tämän %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Olet mitätöimässä seuraavat allekirjoitukset:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Varmastiko luo mitätöintivarmenteet? (k/E) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "salainen avain ei ole saatavilla\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VAROITUS: käyttäjätunnuksen allekirjoitus on päivätty %d sekuntin päähän "
 "tulevaisuuteen\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "käyttäjätunnus \"%s\" on jo mitätöity\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5571,11 +5581,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "julkisen avaimen algorimin %d käsittely ei onnistu\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VAROITUS: mahdollisesti turvaton symmetrisesti salattu istuntoavain\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "tyypin %d alipaketilla on kriittinen bitti asetettuna\n"
@@ -5972,28 +5982,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dataa ei ole tallennettu, käytä valitsinta \"--output\" tallentaaksesi\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Erillinen allekirjoitus.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Anna datatiedoston nimi: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "luetaan vakiosyötettä ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "ei allekirjoitettua dataa\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "allekirjoitetun datan \"%s\" avaaminen ei onnistu\n"
diff --git a/po/fr.po b/po/fr.po
index f4cf8272e..c9507317a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc2\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2008-09-30 19:38+0200\n"
 "Last-Translator: Ga�l Qu�ri <[email protected]>\n"
 "Language-Team: French <[email protected]>\n"
@@ -127,7 +127,7 @@ msgstr "impossible de cr�er `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -347,7 +347,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "changer la phrase de passe"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -358,109 +358,109 @@ msgstr ""
 "Options:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "bavard"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "devenir beaucoup plus silencieux"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "chercher les cl�s avec un serveur de cl�s"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "mettre la base de confiance � jour"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -469,160 +469,160 @@ msgstr ""
 "Signaler toutes anomalies � <@EMAIL@> (en anglais)\n"
 "et tout probl�me de traduction � <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Utilisation: gpg [options] [fichiers] (-h pour l'aide)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fichier d'options `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lire les options de `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, 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:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossible de cr�er `%s': %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erreur pendant l'obtention du nouveau code PIN: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, 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:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�criture de la cl� secr�te dans `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "r�pertoire `%s' cr��\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) �chou� dans %s: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, 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:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, 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:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignor�: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 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:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -830,7 +830,7 @@ msgstr "erreur pendant la cr�ation de la phrase de passe: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -847,7 +847,7 @@ msgstr ""
 "erreur durant la lecture des informations contenues actuellement\n"
 "dans la cl�: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -857,7 +857,7 @@ msgstr "erreur pendant la lecture de `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erreur pendant la lecture de `%s': %s\n"
@@ -973,11 +973,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1229,46 +1234,46 @@ msgstr "armure inattendue: "
 msgid "invalid dash escaped line: "
 msgstr "ligne �chapp�e par `-' invalide: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caract�re %02X invalide en radix64 ignor�\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "fin de fichier pr�matur�e (pas de CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "fin de fichier pr�matur�e (dans le CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC d�form�\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erreur de CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "fin de fichier pr�matur�e (dans la remorque)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "erreur dans la ligne de remorque\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "aucune donn�e OpenPGP valide n'a �t� trouv�e.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armure invalide: ligne plus longue que %d caract�res\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1313,7 +1318,7 @@ msgstr "la carte OpenPGP n'est pas disponible: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "carte OpenPGP n� %s d�tect�e\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1587,7 +1592,7 @@ msgstr "la cl� secr�te est d�j� stock�e sur une carte\n"
 msgid "error writing key to card: %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "quitter ce menu"
 
@@ -1595,7 +1600,7 @@ msgstr "quitter ce menu"
 msgid "show admin commands"
 msgstr "indiquer les commandes d'administration"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "afficher cette aide"
 
@@ -1669,7 +1674,7 @@ msgstr "Les commandes d'administration sont permises\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Les commandes d'administration ne sont pas permises\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Commande invalide  (essayez �help�)\n"
 
@@ -1677,18 +1682,18 @@ msgstr "Commande invalide  (essayez �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n'est pas compatible avec cette commande\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1986,7 +1991,7 @@ msgstr ""
 "La cl� invalide %s a �t� rendue valide par\n"
 "--allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "pas de sous-cl� secr�te pour la cl� publique %s - ignor�e\n"
@@ -2229,7 +2234,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Cl� publique: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Chiffrement: "
 
@@ -2237,7 +2242,7 @@ msgstr "Chiffrement: "
 msgid "Hash: "
 msgstr "Hachage: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compression: "
 
@@ -2405,415 +2410,415 @@ msgstr "NOTE: l'ancien fichier d'options par d�faut `%s' a �t� ignor�\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTE: %s n'est pas pour une utilisation normale !\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' n'est pas un jeu de caract�res valide\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "impossible d'interpr�ter l'URL du serveur de cl�s\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "les options du serveur de cl�s sont invalides\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: options d'import invalides\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "options d'import invalides\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: options d'export invalides\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "options d'export invalides\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: options de liste invalides\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "options de liste invalides\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' n'est pas une date d'expiration de signature valide\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "options de v�rification invalides\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossible de mettre le chemin d'ex�cution � %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: options de v�rification invalides\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENTION: Le programme peut cr�er un fichier �core� !\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENTION: %s remplace %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n'est pas permis avec %s !\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n'a aucun sens avec %s !\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "pas d'ex�cution ave une m�moire non s�curis�e � cause de %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "il n'est possible de faire une signature d�tach�e ou en texte clair\n"
 "qu'en mode --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "vous ne pouvez pas signer et chiffrer en m�me temps en mode --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "vous devez utiliser des fichiers (et pas un tube) lorsque --pgp2\n"
 "est activ�.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "chiffrer un message en mode --pgp2 n�cessite l'algorithme de chiffrage IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algorithme de chiffrement s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "la fonction de hachage s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algorithme de compression s�lectionn� est invalide\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "la fonction de hachage de certification s�lectionn�e est invalide\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "�completes-needed� doit �tre sup�rieur � 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "�marginals-needed� doit �tre sup�rieur � 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth doit �tre compris entre 1 et 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalide; doit �tre 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTE: le mode S2K simple (0) est fortement d�conseill�\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K invalide; ce doit �tre 0, 1 ou 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "pr�f�rences par d�faut invalides\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "pr�f�rences de chiffrement personnelles invalides\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "pr�f�rences de hachage personnelles invalides\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "pr�f�rences de compression personnelles invalides\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s ne marche pas encore avec %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de chiffrement `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de hachage `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser l'algorithme de compression `%s'\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "impossible d'initialiser la base de confiance: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISSEMENT: des destinataires (-r) ont �t� donn�s alors que le\n"
 "chiffrement ne se fait pas par cl� publique\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nom du fichier]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nom du fichier]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "le chiffrement sym�trique de `%s' a �chou�: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nom du fichier]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt avec --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "vous ne pouvez pas utiliser --symmetric --encrypt en mode %s.\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nom du fichier]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nom du fichier]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "Vous ne pouvez pas utiliser --symmetric --sign --encrypt avec\n"
 "--s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "vous ne pouvez pas utiliser --symmetric --sign --encrypt\n"
 "en mode %s.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nom du fichier]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nom du fichier]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nom du fichier]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key utilisateur"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key utilisateur [commandes]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key utilisateur"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "l'envoi vers le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "la r�ception depuis le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "l'export de la cl� a �chou�: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "la recherche au sein du serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "le rafra�chissement par le serveur de cl�s a �chou�: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "la suppression d'une armure a �chou�: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "la construction d'une armure a �chou�: %s \n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algorithme de hachage `%s' invalide\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nom du fichier]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Vous pouvez taper votre message...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL de politique de certification donn�e est invalide\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL de politique de signature donn�e est invalide\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL du serveur de cl�s favori qui a �t� donn�e est invalide\n"
 
@@ -2970,343 +2975,348 @@ msgstr "          signatures nettoy�es: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   noms d'utilisateur nettoy�s: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISSEMENT: la cl� %s contient des pr�ferences pour des\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de chiffrement %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de hachage %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         � %s �: pr�f�rence pour l'algorithme de compression %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "il est fortement sugg�r� de mettre � jour vos pr�f�rences et\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "redistribuer cette cl� pour �viter les probl�mes potentiels qui seraient\n"
 "caus�s par des algorithmes non appropri�s\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "vous pouvez mettre � jour vos pr�f�rences avec: \n"
 "gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cl� %s: pas de nom d'utilisateur\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cl� %s: corruption de sous-cl� PKS r�par�e\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur non auto-sign� accept� � %s �\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cl� %s: pas de nom d'utilisateur valide\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "cela peut provenir d'une auto-signature manquante\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cl� %s: cl� publique non trouv�e: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cl� %s: nouvelle cl� - ignor�e\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "aucun porte-cl� n'a �t� trouv� avec des droits d'�criture : %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�criture de `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erreur durant l'�criture du porte-cl�s `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cl� %s: cl� publique � %s � import�e\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cl� %s: ne ressemble pas � notre copie\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cl� %s: impossible de trouver le bloc de cl�s original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cl� %s: impossible de lire le bloc de cl�s original: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cl� %s: � %s � un nouvel utilisateur\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cl� %s: � %s � %d nouveaux utilisateurs\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cl� %s: � %s � une nouvelle signature\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cl� %s: � %s � %d nouvelles signatures\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cl� %s: � %s � une nouvelle sous-cl�\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cl� %s: � %s � %d nouvelles sous-cl�s\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cl� %s: � %s � %d nom d'utilisateur nettoy�\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cl� %s: � %s � %d noms d'utilisateur nettoy�s\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cl� %s: � %s � n'a pas chang�\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "cl� %s: cl� secr�te avec le chiffrement invalide %d - non prise\n"
 "en compte\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "il est interdit d'importer les cl� secr�tes\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "pas de porte-cl�s par d�faut: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cl� %s: cl� secr�te import�e\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cl� %s: d�j� dans le porte-cl�s secret\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cl� %s: cl� secr�te non trouv�e: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cl� %s: pas de cl� publique - le certificat de r�vocation ne peut\n"
 "�tre appliqu�\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - rejet�\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cl� %s: � %s � certificat de r�vocation import�\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cl� %s: pas de nom d'utilisateur pour la signature\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cl� %s: algorithme de cl� publique non support� avec le nom\n"
 "d'utilisateur � %s �\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cl� %s: auto-signature du nom d'utilisateur � %s � invalide\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cl� %s: algorithme de cl� publique non support�\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "cl� %s: ajout de la signature de cl� directe\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "cl� %s: pas de sous-cl� pour relier la cl�\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cl� %s: liaison avec la sous-cl� invalide\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cl� %s: supression de liaisons multiples avec des sous-cl�s\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cl� %s: pas de sous-cl� pour r�voquer la cl�\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cl� %s: r�vocation de sous-cl� invalide\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cl� %s: suppression de la r�vocation de sous-cl�s multiples\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cl� %s: nom d'utilisateur � %s � non pris en compte\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cl� %s: sous-cl� non prise en compte\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cl� %s: signature non exportable (classe 0x%02X) - ignor�e\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cl� %s: certificat de r�vocation au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cl� %s: certificat de r�vocation invalide: %s - ignor�e\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cl� %s: signature de sous-cl� au mauvais endroit - ignor�e\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cl� %s: classe de signature non attendue (0x%02X) - ignor�e\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cl� %s: nom d'utilisateur en double d�tect� - fusion accomplie\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: recherche de\n"
 "la cl� de r�vocation %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISSEMENT: la cl� %s est peut-�tre r�voqu�e: la cl� de\n"
 "r�vocation %s est absente.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cl� %s: certificat de r�vocation � %s � ajout�\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cl� %s: ajout de la signature de cl� directe\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOTE: le num�ro de s�rie d'une cl� n'est pas celui de la carte\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOTE: la cl� primaire est en ligne et stock�e sur la carte\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOTE: la cl� secondaire est en ligne et stock�e sur la carte\n"
 
@@ -3418,12 +3428,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Le nom d'utilisateur \"%s\" est r�voqu�."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Etes-vous s�r de toujours vouloir le signer ? (o/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Impossible de signer.\n"
 
@@ -3614,8 +3624,8 @@ msgstr "J'ai v�rifi� cette cl� avec grand soin.\n"
 msgid "Really sign? (y/N) "
 msgstr "Signer r�ellement ? (o/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "la signature a �chou�: %s\n"
@@ -3672,194 +3682,194 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voulez-vous vraiment faire cela ? (o/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "replacer la signature d'une cl� � l'endroit correct\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "enregistrer et quitter"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "afficher l'empreinte de la cl�"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "lister la cl� et les noms d'utilisateurs"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "s�lectionner le nom d'utilisateur N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "s�lectionner la sous-cl� N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "v�rifier les signatures"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s [* voir ci-dessous pour\n"
 "les commandes similaires]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "signer le nom d'utilisateur s�lectionn� localement"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "signer les noms d'utilisateurs s�lectionn�s localement"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "signer les noms d'utilisateurs s�lectionn�s avec une signature\n"
 "non-r�vocable"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "ajouter un utilisateur"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "ajouter une photo d'identit�"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "enlever les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "ajouter une sous-cl�"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "ajouter une cl� � une carte � puce"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "d�placer une cl� vers une carte � puce"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "d�placer une cl� de sauvegarde vers une carte � puce"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "enlever les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "ajouter une cl� de r�vocation"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "enlever les signatures des noms d'utilisateur s�lectionn�s "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "changer la date d'expiration de la cl� ou des sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "marquer le nom d'utilisateur s�lectionn� comme principal"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr ""
 "passer de la liste des cl�s secr�tes � celle des cl�s priv�es\n"
 "et inversement"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "lister les pr�f�rences (expert)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "lister les pr�f�rences (bavard)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "indiquer l'URL du serveur de cl�s pr�f�r� pour les noms d'utilisateur\n"
 "s�lectionn�s"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "indiquer la liste des pr�f�rences pour le nom d'utilisateur\n"
 "s�lectionn�"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "changer la phrase de passe"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "changer la confiance"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "r�voquer les signatures des noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "r�voquer les noms d'utilisateur s�lectionn�s"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "r�voquer la cl� ou les sous-cl�s s�lectionn�es"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "activer la cl�"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "d�sactiver la cl�"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "montrer les photos d'identit� s�lectionn�es"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erreur pendant la lecture du bloc de cl� secr�te � %s �: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "La cl� secr�te est disponible.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Il faut la cl� secr�te pour faire cela.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Utilisez la commande �toggle� d'abord.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3871,159 +3881,159 @@ msgstr ""
 "(tsign), par `nr' pour les signatures non-r�vocables (nrsign), ou\n"
 "bien toute combinaison possible (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "La cl� est r�voqu�e."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Signer vraiment tous les nom d'utilisateurs ? (o/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Aide: S�lectionner les utilisateurs � signer\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Type de signature `%s' inconnu\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Cette commande n'est pas admise en mode %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Vous devez s�lectionner au moins un utilisateur.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Vous ne pouvez pas supprimer le dernier utilisateur !\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Enlever r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Enlever r�ellement ce nom d'utilisateur ? (o/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Enlever r�ellement la cl� principale ? (o/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Vous devez s�lectionner exactement une cl�.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "La commande attend un nom de fichier comme argument\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Impossible d'ouvrir `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Erreur durant la lecture de la cl� de sauvegarde de `%s' : %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Vous devez s�lectionner au moins une cl�.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voulez-vous vraiment supprimer les cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voulez-vous vraiment supprimer cette cl� ? (o/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "R�voquer r�ellement tous les noms d'utilisateurs s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "R�voquer r�ellement ce nom d'utilisateur ? (o/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer la cl� enti�re ? (o/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer les sous-cl�s s�lectionn�es ? (o/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voulez-vous vraiment r�voquer cette sous-cl� ? (o/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "La confiance du propri�taire peut ne pas �tre positionn�e en utilisant\n"
 "la base de confiance d'un tiers\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Changer la liste de pr�f�rences en :\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Mettre � jour r�ellement les pr�f�rences des noms d'utilisateurs\n"
 "s�lectionn�s ? (o/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Faut-il vraiment mettre � jour les pr�f�rences ? (o/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Enregistrer les changements? (o/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Quitter sans enregistrer ? (o/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "la mise � jour a �chou�: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "la mise � jour de la cl� secr�te a �chou�: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "La cl� n'a pas chang� donc la mise � jour est inutile.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Hachage: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Fonctions: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Serveur de cl�s: pas-de-modification"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Serveur de cl�s pr�f�r�: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -4031,73 +4041,73 @@ msgstr ""
 "Options:\n"
 " "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Il n'y a pas de pr�f�rences dans un nom d'utilisateur du style de\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Cette cl� a �t� r�voqu�e le %s par la cl� %s %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Cette cl� peut �tre r�voqu�e par la cl� %s %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(sensible)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "cr��: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revoqu�: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "expire: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "utilisation: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr " confiance: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "validit�: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Cette cl� a �t� d�sactiv�e"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "n� de carte: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4105,17 +4115,17 @@ msgstr ""
 "Notez que la validit� affich�e pour la cl� n'est pas n�cessairement\n"
 "correcte tant que vous n'avez pas relanc� le programme.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revoqu�e"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "expir�e"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4124,7 +4134,7 @@ msgstr ""
 "Cette commande risque de rendre un autre nom d'utilisateur principal\n"
 "par d�faut.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4134,75 +4144,75 @@ msgstr ""
 "d'identit� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Etes-vous s�r de vouloir l'ajouter ? (y/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de photo d'identit� � une cl� du style PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Supprimer cette bonne signature ? (o/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Supprimer cette signature invalide ? (o/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Supprimer cette signature inconnue ? (o/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Faut-il vraiment supprimer cette auto-signature ? (o/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d signature supprim�e.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d signatures supprim�es\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Rien n'a �t� supprim�.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "invalide"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "cl� %s: � %s � %d signature nettoy�e\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "cl� %s: � %s � %d signatures nettoy�es\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Nom d'utilisateur \"%s\": d�j� nettoy�.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4212,206 +4222,206 @@ msgstr ""
 "d�sign� peut emp�cher certaines versions de PGP d'accepter\n"
 "cette cl�.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Vous ne pouvez pas ajouter de r�vocateur d�sign� � une cl� de style PGP2.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Entrez le nom d'utilisateur du r�vocateur d�sign�: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossible d'utiliser une cl� de style PGP 2.x comme r�vocateur\n"
 "d�sign�.\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "vous ne pouvez pas utiliser une cl� comme son propre r�vocateur\n"
 "d�sign�\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "cette cl� � d�j� �t� d�sign�e comme un r�vocateur\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISSEMENT: l'�tablissement d'une cl� comme r�vocateur d�sign�\n"
 "est irr�versible !\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Etes-vous s�r de vouloir �tablir cette cl� comme r�vocateur\n"
 "d�sign� ? (o/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Enlevez les s�lections des cl�s secr�tes.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Vous devez s�lectionner au plus une sous-cl�.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Changer la date d'expiration d'une sous-cl�.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Changer la date d'expiration de la cl� principale.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Vous ne pouvez pas changer la date d'expiration d'une cl� v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Pas de signature correspondante dans le porte-cl�s secret\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISSEMENT: la sous-cl� de signature %s n'a pas de certificat\n"
 "crois�\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Vous devez s�lectionner exactement un utilisateur.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "l'auto-signature v3 du nom d'utilisateur � %s � a �t� ignor�e\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Entrez l'URL de votre serveur de cl�s favori: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le remplacer ? (o/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Etes-vous s�r de vouloir le supprimer ? (o/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notation de signature: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "R��crire par-dessus ? (o/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Pas d'utilisateur avec l'index %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Pas de nom d'utilisateur avec le hachage %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Pas de sous-cl� avec l'index %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "nom d'utilisateur: � %s �\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "sign� par votre cl� %s � %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (non-exportable)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Cette signature a expir� le %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Etes-vous s�r de vouloir toujours le r�voquer ? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "G�n�rer un certificat de r�vocation pour cette signature ? (o/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Vous avez sign� ces noms d'utilisateurs sur la cl� %s:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (non-r�vocable)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "r�voqu� par votre cl� %s � %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Vous �tes sur le point de r�voquer ces signatures:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Cr�er r�ellement les certificats de r�vocation ? (o/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "pas de cl� secr�te\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "Le nom d'utilisateur \"%s\" est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISSEMENT: une signature de nom d'utilisateur date de %d secondes\n"
 "dans le futur\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "La cl� %s est d�j� r�voqu�.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "La sous-cl� %s est d�j� r�voqu�e.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5582,13 +5592,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossible de g�rer l'algorithme � cl� publique %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERISSEMENT: la cl� de session chiffr�e de mani�re sym�trique est\n"
 "potentiellement non s�re\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un sous-paquet de type %d poss�de un bit critique\n"
@@ -5981,28 +5991,28 @@ msgstr ""
 "les donn�es ne sont pas enregistr�es; utilisez l'option �--output� pour\n"
 "les enregistrer\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Signature d�tach�e.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Entrez le nom du fichier de donn�es: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "lecture de l'entr�e standard...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "pas de donn�es sign�es\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossible d'ouvir les donn�es sign�es `%s'\n"
diff --git a/po/gl.po b/po/gl.po
index 8f76094e8..51522e81f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2003-12-04 11:39+0100\n"
 "Last-Translator: Jacobo Tarrio <[email protected]>\n"
 "Language-Team: Galician <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "non se pode crear `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -328,7 +328,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -339,109 +339,109 @@ msgstr ""
 "Opci�ns:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "lareto"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ser un pouqui�o m�is calado"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carga-lo m�dulo de extensi�n FICHEIRO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "buscar chaves nun servidor de chaves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualiza-la base de datos de confianza"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -451,158 +451,158 @@ msgstr ""
 "Por favor, informe dos erros no programa a <[email protected]>,\n"
 "e dos erros na traducci�n a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opci�ns] [ficheiros] (-h para ve-la axuda)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de opci�ns `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo as opci�ns de `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "non se pode crea-lo directorio `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "non foi posible crear %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Revocaci�n de certificado v�lida"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro ao crea-lo contrasinal: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar a `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directorio creado\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro lendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves omitidas\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variable de ambiente GPG_AGENT_INFO mal formada\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -810,7 +810,7 @@ msgstr "erro ao crea-lo contrasinal: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "non se puido abrir un ficheiro: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro lendo `%s': %s\n"
@@ -825,7 +825,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro escribindo no chaveiro secreto `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro lendo `%s': %s\n"
@@ -835,7 +835,7 @@ msgstr "erro lendo `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro lendo `%s': %s\n"
@@ -949,11 +949,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1209,47 +1214,47 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "li�a escapada cunha barra non v�lida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "car�cter radix64 non v�lido %02x omitido\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "fin de ficheiro prematura (non hai CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "fin de ficheiro prematura (no CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC mal formado\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fin de ficheiro prematura (nas li�as adicionais)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "error nunha li�a adicional\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "non se atoparon datos OpenPGP v�lidos.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura incorrecta: li�a m�is longa ca %d caracteres\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1295,7 +1300,7 @@ msgstr "a chave secreta non est� dispo�ible"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1580,7 +1585,7 @@ msgstr "om�tese: a chave secreta xa est� presente\n"
 msgid "error writing key to card: %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "sa�r deste men�"
 
@@ -1589,7 +1594,7 @@ msgstr "sa�r deste men�"
 msgid "show admin commands"
 msgstr "comandos conflictivos\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "amosar esta axuda"
 
@@ -1669,7 +1674,7 @@ msgstr "comandos conflictivos\n"
 msgid "Admin commands are not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando incorrecto (tente \"help\")\n"
 
@@ -1677,18 +1682,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1982,7 +1987,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Chave %08lX non v�lida convertida en v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2225,7 +2230,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "P�blica: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -2233,7 +2238,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compresi�n: "
 
@@ -2375,411 +2380,411 @@ msgstr "NOTA: ign�rase o antigo ficheiro de opci�ns por defecto `%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: �%s non � para uso normal!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opci�ns de importaci�n non v�lidas\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un xogo de caracteres v�lido\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "non se puido estabrecer exec-path a %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opci�ns de exportaci�n non v�lidas\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: �o programa pode crear un ficheiro 'core'!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s fai que se ignore %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "�%s non se admite con %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "�%s non ten sentido empreg�ndoo con %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode crear sinaturas separadas ou en claro no modo --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "non pode asinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "debe empregar ficheiros (e non canalizaci�ns) ao traballar con --pgp2 "
 "activado.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "para cifrar unha mensaxe en modo --pgp2 prec�sase da cifra IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifrado seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de resumo de certificaci�n seleccionado non � v�lido\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed debe ser superior a 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed debe ser superior a 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth debe valer entre 1 e 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "nivel de comprobaci�n por defecto non v�lido; debe ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: desacons�llase encarecidamente o modo S2K simple (0)\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non v�lido; debe ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "preferencias por defecto non v�lidas\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "preferencias de cifrado personais non v�lidas\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "preferencias de resumo personais non v�lidas\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "preferencias de compresi�n personais non v�lidas\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "�%s a�nda non traballa con %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de cifrado \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de resumo \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "non se pode empregar o algoritmo de compresi�n \"%s\" no modo %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "non se puido inicializa-la base de datos de confianzas: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: deronse destinatarios (-r) sen empregar cifrado de chave p�blica\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [ficheiro]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [ficheiro]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "o descifrado fallou: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [ficheiro]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [ficheiro]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [ficheiro]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non se pode empregar %s no modo %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [ficheiro]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [ficheiro]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [ficheiro]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-de-usuario"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-de-usuario [comandos]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-de-usuario"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "o env�o ao servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "a recepci�n do servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "a exportaci�n da chave fallou: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "a busca no servidor de chaves fallou fallou: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "a actualizaci�n no servidor de chaves fallou: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "non se puido quita-la armadura: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "non se puido po�e-la armadura: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash non v�lido `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[ficheiro]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Escriba a s�a mensaxe ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "o URL de normativa de certificaci�n dado non � v�lido\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "o URL de normativa de sinaturas dado non � v�lido\n"
@@ -2935,347 +2940,352 @@ msgstr "         novas sinaturas: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "chaves secretas lidas: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Sinatura %s, algoritmo de resumo %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: non hai ID de usuario\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: arranxouse a corrupci�n da sub-chave HKP\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceptouse o ID de usuario '%s' sen auto-sinatura\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: non hai IDs de usuario v�lidos\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por unha auto-sinatura que falta\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica non atopada: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: nova chave - omitida\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non se atopou un chaveiro no que se poida escribir: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escribindo a `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro escribindo no chaveiro `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: non coincide coa nosa copia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible localiza-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr ""
 "chave %08lX: non foi posible le-lo bloque de chaves original:\n"
 "%s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %08lX: \"%s\" 1 novo ID de usuario\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova sinatura\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova sub-chave\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas sub-chaves\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas sinaturas\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de usuario\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" sen cambios\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta cunha cifra %d non v�lida - omitida\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "gravando a chave secreta en `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "non hai un chaveiro privado por defecto: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: xa estaba no chaveiro secreto\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta non atopada: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: non hai chave p�blica - non se pode aplica-lo\n"
 "certificado de revocaci�n\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "chave %08lX: certificado de revocaci�n incorrecto:\n"
 "%s - rechazado\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n importado\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: non hai ID de usuario para a sinatura\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica non soportado no ID de usuario \"%s"
 "\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: auto-sinatura non v�lida no identificadr de usuario \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica non soportado\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "chave %08lX: non hai sub-chave para a ligaz�n da chave\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: ligaz�n de sub-chave incorrecta\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: eliminouse unha ligaz�n de sub-chave m�ltiple\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: non hai unha sub-chave para a revocaci�n da chave\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revocaci�n de sub-chave non v�lida\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: eliminouse a revocaci�n de sub-chaves m�ltiples\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: omitido o ID de usuario '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: omitida a sub-chave\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: sinatura non exportable (clase %02x) - omitida\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n no lugar err�neo - omitido\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revocaci�n incorrecto: %s - omitido\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: sinatura da sub-chave nun lugar incorrecto - omitida\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: clase de sinatura non esperada (0x%02X) - omitida\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: ID de usuario duplicado detectado - mesturado\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: obtendo a chave de revocaci�n %"
 "08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revocaci�n %08lX "
 "ausente.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: \"%s\" certificado de revocaci�n engadido\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: engadiuse unha sinatura de chave directa\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "�a chave p�blica con coincide coa chave secreta!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "om�tese: a chave secreta xa est� presente\n"
@@ -3383,12 +3393,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "O ID de usuario \"%s\" est� revocado."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "�Est� seguro de que quere asinalo? (s/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr " Non se puido asinar.\n"
 
@@ -3598,8 +3608,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "�Asinar de verdade? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "fallou a sinatura: %s\n"
@@ -3655,207 +3665,207 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "�Seguro que quere facer esto? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a sinatura dunha chave � seu sitio\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "gardar e sa�r"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "amosar fingerprint"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "listar chave e IDs de usuario"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "selecciona-lo ID de usuario N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revocar sinaturas"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "asina-la chave localmente"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "engadir un ID de usuario"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "engadir unha identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "borrar un ID de usuario"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "borrar unha chave secundaria"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "engadir unha chave de revocaci�n"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "marcar un ID de usuario coma primario"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambiar entre o listado de chaves p�blicas e secretas"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "lista-las preferencias (expertos)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "lista-las preferencias (moitos datos)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "non se puido analisa-lo URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "cambia-lo contrasinal"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "cambia-la confianza sobre o dono"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar un ID de usuario"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revocar unha chave secundaria"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "habilitar unha chave"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "deshabilitar unha chave"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "amosa-la identificaci�n fotogr�fica"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro ao le-lo bloque de chave secreta `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "A chave secreta est� disponible.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "C�mpre a chave secreta para facer isto.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor, empregue o comando \"toggle\" antes.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3863,244 +3873,244 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "A chave est� revocada."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "�Seguro de que quere asinar t�dolos IDs de usuario? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Pista: seleccione os IDs de usuario que desexa asinar\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "clase de sinatura desco�ecida"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Non se admite este comando no modo %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Debe seleccionar alomenos un ID de usuario.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "�Non pode borra-lo �ltimo ID de usuario!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere borrar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "�Seguro de que quere borrar este ID de usuario? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "non se puido abrir `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao crea-lo chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Debe seleccionar alomenos unha chave.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "�Seguro de que quere borra-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "�Seguro de que quere borrar esta chave? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "�Seguro de que quere revocar t�dolos IDs de usuario seleccionados? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "�Seguro de que quere revocar este ID de usuario? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "�Realmente quere revoca-las chaves seleccionadas? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "�Realmente quere revocar esta chave? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "estabrece-la lista de preferencias"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "�Seguro que quere actualiza-las preferencias dos IDs de usuario "
 "seleccionados? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "�Realmente desexa actualiza-las preferencias? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "�Garda-los cambios? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "�Sa�r sin gardar? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "a actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "o segredo da actualizaci�n fallou: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "A chave non cambiou, polo que non fai falla actualizar.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Resumo: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Notaci�n: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non hai preferencias nun ID de usuario estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode estar revocada por %s chave "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensible)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "non foi posible crear %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [caduca: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confianza: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Esta chave est� desactivada"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4108,19 +4118,19 @@ msgstr ""
 "Te�a en conta que a validez da chave amosada non � necesariamente\n"
 "correcta a menos que reinicie o programa.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revocada] "
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4128,7 +4138,7 @@ msgstr ""
 "AVISO: non se marcou ning�n ID de usuario coma primario. Esta orde pode\n"
 "              facer que un ID de usuario diferente se converta no primario.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4137,77 +4147,77 @@ msgstr ""
 "AVISO: Esta � unha chave de estilo PGP2. Se engade unha identificaci�n\n"
 "       fotogr�fica algunhas versi�ns de PGP han rexeitar esta chave.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "�Est� seguro de que quere engadila? (s/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non pode engadir unha identificaci�n fotogr�fica a unha chave de estilo "
 "PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�Borrar esta sinatura correcta? (s/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�Borrar esta sinatura incorrecta? (s/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�Borrar esta sinatura desco�ecida? (s/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�Realmente quere borrar esta auto-sinatura? (s/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Borrada %d sinatura.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Borradas %d sinaturas.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Non se borrou nada.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armadura non v�lida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "O ID de usuario \"%s\" est� revocado."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4217,209 +4227,209 @@ msgstr ""
 "designado\n"
 "       pode facer que algunhas versi�ns de PGP rexeiten esta chave.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non pode engadir un revocador designado a unha chave de estilo PGP 2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduza o ID de usuario do revocador designado: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "non se pode nomear unha chave estilo PGP 2.x coma revocador designado\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "non se pode nomear unha chave coma o seu propio revocador designado\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: �Esta chave est� revocada polo propietario!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "�Est� seguro de que quere nomear esta chave coma revocador designado? (s/N): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor, quite as selecci�ns das chaves secretas.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor, seleccione como m�ximo unha chave secundaria.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambiando a data de expiraci�n para a chave secundaria.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambiando a data de expiraci�n da chave primaria.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non pode cambia-la data de expiraci�n dunha chave v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Non hai unha sinatura correspondiente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVISO: �o nomeamento dunha chave coma o seu propio revocador designado non "
 "se pode desfacer!\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Escolla exactamente un ID de usuario.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "omitindo a auto-sinatura v3 do id de usuario \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�Est� seguro de que quere empregala (s/N)? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notaci�n de sinaturas: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "�Sobrescribir? (s/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Non hai ID de usuario con �ndice %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usuario: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   asinada por %08lX no %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta sinatura caducou o %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "�Est� seguro de que quere revocala? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "�Crear un certificado de revocaci�n para esta sinatura? (s/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   asinada por %08lX no %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Asinou estes IDs de usuario: \n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non exportable)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocada por %08lX no %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� a punto de revocar estas sinaturas:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "�Realmente desexa crea-los certificados de revocaci�n? (s/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "non hai chave secreta\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: unha sinatura de ID de usuario ten unha data %d segundos no futuro\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o ID de usuario \"%s\" xa est� revocado\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5577,12 +5587,12 @@ msgstr "AVISO: as opci�ns de `%s' a�nda non est�n activas nesta execuci�n\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "non � posible manexa-lo algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVISO: chave de sesi�n cifrada simetricamente potencialmente insegura\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "un subpaquete de tipo %d ten o bit cr�tico posto\n"
@@ -5977,28 +5987,28 @@ msgstr "chave %08lX: non hai ID de usuario\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "os datos non foron gardados; use a opci�n \"--output\" para gardalos\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Sinatura non adxunta.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Por favor, introduza o nome do ficheiro de datos: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "lendo de stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "non hai datos asinados\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "non foi posible abri-los datos asinados `%s'\n"
diff --git a/po/hu.po b/po/hu.po
index 27a48f60d..b5b794a86 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2004-06-19 21:53+0200\n"
 "Last-Translator: Nagy Ferenc L�szl� <[email protected]>\n"
 "Language-Team: Hungarian <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "Nem tudom l�trehozni a(z) \"%s\" �llom�nyt: %s.\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -327,7 +327,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -338,107 +338,107 @@ msgstr ""
 "Opci�k:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "b�besz�d� m�d"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "m�g sz�kszav�bb m�d"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|f�jl|b�v�t� modul bet�lt�se"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "kulcsok keres�se kulcsszerveren"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "bizalmi adatb�zis friss�t�se"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -446,158 +446,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "A hib�kat (angolul) a <[email protected]> c�mre �rja meg!\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Haszn�lat: gpg [opci�k] [f�jlok] (-h a s�g�hoz)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "\"%s\" opci�s f�jl: %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "Az opci�kat a \"%s\" �llom�nyb�l olvasom.\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, 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:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, 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:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: K�nyvt�rat l�trehoztam.\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: kihagyva: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 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:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -805,7 +805,7 @@ msgstr "Hiba a jelsz� l�trehoz�sakor: %s.\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "Nem tudom megnyitni az �llom�nyt: %s.\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -820,7 +820,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "Hiba a(z) \"%s\" titkoskulcs-karika �r�sakor: %s.\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -830,7 +830,7 @@ msgstr "Hiba \"%s\" olvas�sakor: %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "Hiba \"%s\" olvas�sakor: %s\n"
@@ -944,11 +944,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1200,47 +1205,47 @@ msgstr "V�ratlan p�nc�l:"
 msgid "invalid dash escaped line: "
 msgstr "�rv�nytelen k�t�jeles sor: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Kihagytam a %02x k�d� �rv�nytelen radix64 karaktert.\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "Korai �llom�nyv�g (nincs CRC).\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "Korai �llom�nyv�g (a CRC-ben).\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "Hib�s form�j� CRC.\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hiba; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "Korai �llom�nyv�g (a lez�r�sban).\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "Hiba a z�r� sorban!\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "Nem tal�ltam �rv�nyes OpenPGP adatot.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "�rv�nytelen p�nc�l: %d karaktern�l hosszabb sor.\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1285,7 +1290,7 @@ msgstr "titkos kulcs nem �ll rendelkez�sre"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1570,7 +1575,7 @@ msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 msgid "error writing key to card: %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "kil�p�s ebb�l a men�b�l"
 
@@ -1579,7 +1584,7 @@ msgstr "kil�p�s ebb�l a men�b�l"
 msgid "show admin commands"
 msgstr "Egym�snak ellentmond� parancsok!\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "megmutatja ezt a s�g�t"
 
@@ -1659,7 +1664,7 @@ msgstr "Egym�snak ellentmond� parancsok!\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 
@@ -1667,18 +1672,18 @@ msgstr "�rv�nytelen parancs! (Pr�b�lja a s�g�t: \"help\".)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "Az --output opci� nem m�k�dik ehhez a parancshoz.\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1967,7 +1972,7 @@ msgstr ""
 "%08lX �rv�nytelen kulcsot �rv�nyes�tett�k az\n"
 "--allow-non-selfsigned-uid opci�val.\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2210,7 +2215,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Nyilv�nos kulcs� (pubkey): "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Rejtjelez� (cipher): "
 
@@ -2218,7 +2223,7 @@ msgstr "Rejtjelez� (cipher): "
 msgid "Hash: "
 msgstr "Kivonatol� (hash): "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "T�m�r�t� (compression): "
 
@@ -2360,409 +2365,409 @@ msgstr "MEGJEGYZ�S: Figyelmen k�v�l hagytam a r�gi opci�kat (%s).\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MEGJEGYZ�S: %s nem norm�l haszn�latra van!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: �rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "�rv�nytelen import opci�k!\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nem �rv�nyes karakterkioszt�s!\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "�rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "Nem tudom a v�grehajt�si el�r�si utat %s �rt�kre �ll�tani!\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: �rv�nytelen export opci�k!\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "FIGYELEM: A program core �llom�nyt hozhat l�tre!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "FIGYELEM: %s hat�stalan�tja %s-t!\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s �s %s nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s �rtelmetlen %s mellett!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "Csak k�l�n�ll� �s olvashat�sz�veg-al��r�st k�sz�thet --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Nem �rhat al� �s titkos�that egyszerre --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Csak �llom�nyokat (pipe-ot nem) haszn�lhat --pgp2 m�dban!\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�zenet titkos�t�sa --pgp2 m�dban IDEA rejtjelez�t ig�nyel!\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "A kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "A kiv�lasztott rejtjelez� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "Az igazol�shoz kiv�lasztott kivonatol� algoritmus �rv�nytelen!\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed nagyobb kell legyen 0-n�l!\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed nagyobb kell legyen 1-n�l!\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 1 �s 255 k�z� kell essen!\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "�rv�nytelen default-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "�rv�nytelen min-cert-level; 0, 1, 2 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MEGJEGYZ�S: Egyszer� S2K m�d (0) er�sen ellenjavallt!\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "�rv�nytelen S2K m�d; 0, 1 vagy 3 lehet.\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "�rv�nytelen alap�rtelmezett preferenci�k!\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "�rv�nytelen szem�lyes rejtjelez�-preferenci�k!\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "�rv�nytelen szem�lyes kivonatol�preferenci�k!\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "�rv�nytelen szem�lyes t�m�r�t�preferenci�k!\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s �s %s egyel�re nem haszn�lhat� egy�tt!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" rejtjelez� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "Lehet, hogy nem haszn�lhatja \"%s\" kivonatol� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja \"%s\" t�m�r�t� algoritmust %s m�dban!\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "Bizalmi adatb�zis (%s) inicializ�l�sa sikertelen!\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "FIGYELEM: C�mzett megadva (-r), de nincs nyilv�nos kulcs� titkos�t�s!\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [f�jln�v]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [f�jln�v]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "Visszafejt�s sikertelen: %s.\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [f�jln�v]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [f�jln�v]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [f�jln�v]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "Lehet, hogy nem haszn�lhatja %s-t %s m�dban!\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [f�jln�v]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [f�jln�v]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [f�jln�v]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key felh-azonos�t�"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key felh-azonos�t� [parancsok]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key felh-azonos�t�"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "K�ld�s a kulcsszerverre sikertelen: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "V�tel a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Kulcsexport�l�s sikertelen: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Keres�s a kulcsszerveren sikertelen: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Friss�t�s a kulcsszerverr�l sikertelen: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "P�nc�l elt�vol�t�sa nem siker�lt: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "P�nc�loz�s nem siker�lt: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "�rv�nytelen kivonatol� algoritmus: %s\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[f�jln�v]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Kezdheti g�pelni az �zenetet...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "A megadott igazol�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "A megadott al��r�si elj�r�sm�d URL-je �rv�nytelen!\n"
@@ -2918,339 +2923,344 @@ msgstr "              �j al��r�sok: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "   olvasott titkos kulcsok: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s al��r�s, %s kivonatol� algoritmus.\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "%08lX kulcs: HKP alkulcss�r�l�s kijav�tva.\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "%08lX kulcs: Nem �nal��rt felh. azonos�t� (\"%s\") elfogadva.\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "%08lX kulcs: Nincs �rv�nyes felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "Ezt okozhatja egy hi�nyz� �nal��r�s.\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "%08lX kulcs: Nyilv�nos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "%08lX kulcs: �j kulcs - kihagytam.\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "Nem �rhat� kulcskarik�t tal�ltam: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "�rok a \"%s\" �llom�nyba.\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "Hiba a \"%s\" kulcskarika �r�sakor: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "%08lX kulcs: \"%s\" nyilv�nos kulcs import�lva.\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "%08lX kulcs: Nem egyezik a mi m�solatunkkal!\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tal�lom az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "%08lX kulcs: Nem tudom beolvasni az eredeti kulcsblokkot: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j al��r�s.\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "%08lX kulcs: \"%s\" 1 �j alkulcs.\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "%08lX kulcs: \"%s\" %d �j alkulcs.\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j al��r�s.\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "%08lX kulcs: \"%s\" %d �j felhaszn�l�i azonos�t�.\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "%08lX kulcs: \"%s\" nem v�ltozott.\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr ""
 "%08lX kulcs: Titkos kulcs �rv�nytelen (%d) rejtjelez�vel - kihagytam.\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "�rom a titkos kulcsot a %s �llom�nyba.\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "Nincs alap�rtelmezett titkoskulcs-karika: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "%08lX kulcs: Titkos kulcs import�lva.\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "%08lX kulcs: M�r szerepel a titkoskulcs-karik�n.\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "%08lX kulcs: Titkos kulcs nem tal�lhat�: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "%08lX kulcs: Nincs nyilv�nos kulcs - nem tudok visszavonni.\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - visszautas�tva.\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st import�ltam.\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "%08lX kulcs: Nincs felhaszn�l�i azonos�t� ehhez az al��r�shoz!\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� alg. a \"%s\" felh. "
 "azonos�t�n!\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "%08lX kulcs: �rv�nytelen �nal��r�s a \"%s\" felh. azonos�t�n!\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "%08lX kulcs: Nem t�mogatott nyilv�nos kulcs� algoritmus!\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "%08lX kulcs: Nincs alkulcs a kulcsk�t�shez!\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsk�t�s!\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsk�t�st.\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "%08lX kulcs: Nincs alkulcs a kulcsvisszavon�shoz.\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "%08lX kulcs: �rv�nytelen alkulcsvisszavon�s.\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "%08lX kulcs: Elt�vol�tottam a t�bbsz�r�s alkulcsvisszavon�st.\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "%08lX kulcs: Kihagytam a felh. azonos�t�t: '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "%08lX kulcs: Alkulcsot kihagytam.\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "%08lX kulcs: Nem export�lhat� al��r�s (%02x. oszt�ly) - kihagytam.\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "%08lX kulcs: Visszavon� igazol�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "%08lX kulcs: �rv�nytelen visszavon� igazol�s: %s - kihagytam.\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "%08lX kulcs: Alkulcsal��r�s rossz helyen - kihagytam.\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "%08lX kulcs: V�ratlan al��r�soszt�ly (0x%02X) - kihagytam.\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "%08lX kulcs: Dupl�zott felh. azonos�t�t tal�ltam - �sszef�ztem.\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "leh�vom a %08lX visszavon� kulcsot.\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "FIGYELEM: %08lX kulcsot visszavonhatt�k:\n"
 "visszavon� kulcs (%08lX) nincs jelen.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "%08lX kulcs: \"%s\" visszavon� igazol�st hozz�adtam.\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "%08lX kulcs: Kulcsal��r�st hozz�adtam.\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "A nyilv�nos kulcs nem passzol a titkos kulcshoz!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "Kihagytam: titkos kulcs m�r jelen van.\n"
@@ -3359,12 +3369,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Biztos abban, hogy tov�bbra is al� akarja �rni? (i/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Nem tudom al��rni.\n"
 
@@ -3574,8 +3584,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Val�ban al��rja? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "Al��r�s sikertelen: %s\n"
@@ -3631,201 +3641,201 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Val�ban ezt akarja? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "�trakom a kulcsal��r�st a megfelel� helyre.\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "ment�s �s kil�p�s"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "megmutatja az ujjlenyomatot"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "kilist�zza a kulcs- �s felhaszn�l�azonos�t�kat"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "N. felhaszn�l�i azonos�t� kiv�laszt�sa"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "al��r�sok visszavon�sa"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "kulcs helyi al��r�sa"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "felhaszn�l�i azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "fot�azonos�t� hozz�ad�sa"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "felhaszn�l�i azonos�t� t�rl�se"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "m�sodlagos kulcs t�rl�se"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "visszavon� kulcs hozz�ad�sa"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "felhaszn�l�azonos�t� megjel�l�se els�dlegesk�nt"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "v�lt�s a titkos �s a nyilv�nos kulcs list�z�sa k�z�tt"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "preferenci�k list�z�sa (szak�rt�)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "preferenci�k list�z�sa (r�szletes)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�rtelmezhetetlen a kulcsszerver URI-ja!\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "jelsz�v�ltoztat�s"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "kulcstulajdonos megb�zhat�s�g�nak be�ll�t�sa"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "felhaszn�l�i azonos�t� visszavon�sa"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "m�sodlagos kulcs visszavon�sa"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "kulcs enged�lyez�se"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "kulcs tilt�sa"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "fot�azonos�t� megmutat�sa"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "Hiba \"%s\" titkoskulcs-blokk olvas�sakor: %s.\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Titkos kulcs rendelkez�sre �ll.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Ehhez sz�ks�g van a titkos kulcsra.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "K�rem, haszn�lja el�bb a \"toggle\" parancsot!\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3833,242 +3843,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "A kulcsot visszavont�k."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Val�ban al��rja az �sszes felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Javaslat: V�lassza ki az al��rni k�v�nt felhaszn�l�azonos�t�kat!\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "ismeretlen al��r�soszt�ly"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Ez a parancs %s m�dban nem enged�lyezett.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Legal�bb egy felhaszn�l�azonos�t�t ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem t�r�lheti az utols� felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Val�ban elt�vol�tja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Val�ban elt�vol�tja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" �llom�nyt: %s.\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Hiba a(z) \"%s\" kulcskarika l�trehoz�sakor: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Legal�bb egy kulcsot ki kell v�lasztania!\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Val�ban t�rli a kiv�lasztott kulcsokat? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Val�ban t�rli ezt a kulcsot? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Val�ban visszavonja az �sszes kijel�lt felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Val�ban visszavonja ezt a felhaszn�l�azonos�t�t? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Val�ban visszavonja a kijel�lt kulcsokat? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Val�ban visszavonja ezt a kulcsot? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "preferencialista be�ll�t�sa"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Val�ban friss�ti a kijel�lt felhaszn�l�azonos�t�k preferenci�it? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Val�ban friss�tsem a preferenci�kat? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Mentsem a v�ltoztat�sokat? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Kil�pjek ment�s n�lk�l? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "Friss�t�s sikertelen: %s.\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "Titkoskulcs-blokk friss�t�se sikertelen: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "A kulcs nem v�ltozott, nincs sz�ks�g friss�t�sre.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Kivonat: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Jellemz�k: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Jel�l�s: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nincsenek preferenci�k egy PGP 2.x felhaszn�l�azonos�t�n!\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Ezt a kulcsot a k�vetkez� %s kulcs visszavonhatja: "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (�rz�keny)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s nem hozhat� l�tre: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [lej�r: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " bizalom: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Ez a kulcs tiltott."
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4076,19 +4086,19 @@ msgstr ""
 "K�rem, vegye figyelembe, hogy az itt l�that� kulcs �rv�nyess�ge nem\n"
 "felt�tlen�l helyes, am�g �jra nem ind�tja a programot!\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[visszavont] "
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4096,7 +4106,7 @@ msgstr ""
 "FIGYELEM: Nincs kijel�lt els�dleges felhaszn�l�azonos�t�. Ez a parancs\n"
 " azt okozhatja, hogy egy m�sik azonos�t� lesz els�dlegesk�nt haszn�lva.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4106,75 +4116,75 @@ msgstr ""
 "okozhatja,\n"
 "          hogy a PGP egyes verzi�i visszautas�tj�k ezt a kulcsot.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tov�bbra is hozz� akarja adni? (i/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Lehet, hogy nem adhat fot�azonos�t�t egy PGP2 st�lus� kulcshoz!\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "T�rli ezt a j� al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "T�rli ezt az �rv�nytelen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "T�rli ezt az ismeretlen al��r�st? (i/N/k)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Val�ban t�rli ezt az �nal��r�st? (i/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "T�r�ltem %d al��r�st.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nem t�r�ltem semmit.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "�rv�nytelen p�nc�l"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t visszavont�k."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4184,204 +4194,204 @@ msgstr ""
 "          azt okozhatja, hogy egyes PGP verzi�k visszautas�tj�k ezt a "
 "kulcsot!\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Lehet, hogy nem adhat kijel�lt visszavon�t egy PGP 2.x-st�lus� kulcshoz.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "�rja be a kijel�lt visszavon� felhaszn�l�azonos�t�j�t: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "Nem adhat meg PGP 2.x st�lus� kulcsot kijel�lt visszavon�nak!\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "Nem adhat meg egy kulcsot saj�t kijel�lt visszavon�j�nak!\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "FIGYELEM: Ezt a kulcsot a kijel�lt visszavon� visszavonta!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "FIGYELEM: A kijel�lt visszavon� kulcs megad�sa nem csin�lhat� vissza!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Biztosan ez a kulcs legyen a kijel�lt visszavon�? (i/N): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "K�rem, t�vol�tsa el a kijel�l�seket a titkos kulcsokr�l!\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Maximum egy m�sodlagos kulcsot jel�lj�n ki, k�rem!\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "M�sodlagos kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Els�dleges kulcs lej�rati idej�nek v�ltoztat�sa.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem v�ltoztathatja meg egy v3 kulcs lej�rati d�tum�t!\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nincs megfelel� al��r�s a titkoskulcs-karik�n.\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "FIGYELEM: %08lX al��r� alkulcs nem kereszthiteles�tett.\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "K�rem, v�lasszon ki pontosan egy felhaszn�l�azonos�t�t!\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "Kihagyom a v3 �nal��r�st a \"%s\" felhaszn�l�azonos�t�n.\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Biztos abban, hogy haszn�lni akarja (i/N)? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Al��r�s-jel�l�s: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Fel�l�rjam (i/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nincs %d index� felhaszn�l�azonos�t�!\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Felhaszn�l�azonos�t�: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   al��rva %08lX �ltal %s%s%s id�pontban.\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Ez az al��r�s lej�rt %s id�pontban.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Biztos benne, hogy m�gis visszavonja? (i/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Csin�ljunk egy visszavon� igazol�st ehhez az al��r�shoz? (i/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   al��rva %08lX �ltal %s%s id�pontban.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�n al��rta a k�vetkez� felhaszn�l�azonos�t�kat:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nem export�lhat�)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   visszavonva %08lX �ltal %s id�pontban.\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "A k�vetkez� al��r�sokat fogja visszavonni:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Val�ban l�trehozzam a visszavon� igazol�st? (i/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "Nincs titkos kulcs.\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "FIGYELEM: A felhaszn�l�azonos�t�t %d m�sodperccel a j�v�ben �rt�k al�.\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "\"%s\" felhaszn�l�i azonos�t�t m�r visszavont�k.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s fot�azonos�t� (m�ret: %ld, kulcs: 0x%08lX, felh: %d) mutat�sa.\n"
@@ -5543,12 +5553,12 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "Nem tudom kezelni a(z) %d. sz�m� nyilv�nos kulcs� algoritmust!\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "FIGYELEM: A rejtjelezett munkafolyamat-kulcs lehet, hogy nem biztons�gos!\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "A %d t�pus� alcsomag kritikus bitje be�ll�tott.\n"
@@ -5944,28 +5954,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "Az adatot nem mentettem el. Haszn�lja az \"--output\" opci�t a ment�shez!\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "K�l�n�ll� al��r�s.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "K�rem, adja meg az adat�llom�ny nev�t: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "Olvasom a szabv�nyos bemenetet...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "Nincs al��rt adat.\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "Nem tudom megnyitni a(z) \"%s\" al��rt adatot!\n"
diff --git a/po/id.po b/po/id.po
index 40c8c3d05..efd61679c 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-id\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2004-06-17 16:32+0700\n"
 "Last-Translator: Tedi Heriyanto <[email protected]>\n"
 "Language-Team: Indonesian <[email protected]>\n"
@@ -123,7 +123,7 @@ msgstr "tidak dapat membuat %s: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -329,7 +329,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "ubah passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -340,107 +340,107 @@ msgstr ""
 "Pilihan:\n"
 "  "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detil"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "lebih diam"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|muat modul ekstensi FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cari kunci di key server"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "perbarui database trust"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -448,158 +448,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Laporkan bug ke <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pemakaian: gpg [pilihan] [file] (-h untuk bantuan)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "CATATAN: tidak ada file pilihan baku `%s'\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file pilihan `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "membaca pilihan dari `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "tidak dapat membuat direktori `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "kesalahan penciptaan passphrase: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "kesalahan mengirim ke `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: direktori tercipta\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read failed (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: tidak dapat membuat direktori: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: dilewati: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent tidak tersedia untuk sesi ini\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabel lingkungan GPG_AGENT_INFO salah bentuk\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -807,7 +807,7 @@ msgstr "kesalahan penciptaan passphrase: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "tidak dapat membuka file: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -822,7 +822,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "kesalahan menulis keyring rahasia `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -832,7 +832,7 @@ msgstr "kesalahan membaca `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "kesalahan membaca `%s': %s\n"
@@ -946,11 +946,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1202,47 +1207,47 @@ msgstr "armor tidak terduga:"
 msgid "invalid dash escaped line: "
 msgstr "dash escaped line tidak valid: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "karakter radix64 tidak valid %02x dilewati\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (tanpa CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (dalam CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC tidak tepat\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "kesalahan CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (dalam Trailer)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "kesalahan dalam garis trailer\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "tidak ditemukan data OpenPGP yang valid.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armor tidak valid: baris melebihi %d karakter\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1288,7 +1293,7 @@ msgstr "kunci rahasia tidak tersedia"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1573,7 +1578,7 @@ msgstr "dilewati: kunci pribadi telah ada\n"
 msgid "error writing key to card: %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "berhenti dari menu ini"
 
@@ -1582,7 +1587,7 @@ msgstr "berhenti dari menu ini"
 msgid "show admin commands"
 msgstr "perintah saling konflik\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "tampilkan bantuan"
 
@@ -1662,7 +1667,7 @@ msgstr "perintah saling konflik\n"
 msgid "Admin commands are not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Perintah tidak valid (coba \"help\")\n"
 
@@ -1670,18 +1675,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1970,7 +1975,7 @@ msgstr "tampilkan fingerprint"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "kunci tidak valid %08lX dibuat valid oleh --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "tidak ada subkey rahasia untuk subkey publik %08lX. diabaikan\n"
@@ -2212,7 +2217,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -2220,7 +2225,7 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Kompresi: "
 
@@ -2362,417 +2367,417 @@ msgstr "CATATAN: file pilihan baku lama `%s' diabaikan\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "CATATAN: %s tidak untuk pemakaian normal!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opsi impor tidak valid\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opsi impor tidak valid\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s bukanlah set karakter yang valid\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "tidak dapat menset path exec ke %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opsi ekspor tidak valid\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "PERINGATAN: program mungkin membuat file core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "PERINGATAN: %s menimpa %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s tidak dibolehkan dengan %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s tidak masuk akal dengan %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "anda hanya dapat membuat signature detached atau clear saat dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "anda tidak dapat menandai dan mengenkripsi pada saat bersamaan dalam mode --"
 "pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "anda harus menggunakan file (dan bukan pipe) saat bekerja dengan opsi --"
 "pgpg2\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "mengenkripsi pesan dalam mode --pgp2 membutuhkan cipher IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritma digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritma cipher yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritma sertifikasi digest yang dipilih tidak valid\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed harus lebih dari 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed harus lebih dari 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth harus di antara 1 hingga 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "level cert default tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "level cert min tidak valid; harus 0, 1, 2, atau 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "CATATAN: mode S2K sederhana (0) tidak dianjurkan\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mode S2K yang tidak valid; harus 0, 1 atau 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "preferensi baku tidak valid\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "preferensi cipher personal tidak valid\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "preferensi digest personal tidak valid\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "preferensi kompresi personal tidak valid\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s belum dapat dipakai dengan %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma cipher \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma digest \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "anda tidak boleh menggunakan algoritma kompresi \"%s\" saat dalam mode %s.\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "gagal inisialisasi TrustDB: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "Peringatan: penerima yang disebutkan (-r) tanpa menggunakan enkripsi public "
 "key \n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [namafile]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [namafile]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "dekripsi gagal: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [namafile]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [namafile]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [namafile]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "anda tidak boleh menggunakan %s saat dalam mode %s.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [namafile]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [namafile]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [namafile]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-user"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-user [perintah]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-user"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "Pengiriman keyserver gagal: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "Penerimaan keyserver gagal: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "Ekspor kunci gagal: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "Pencarian keyserver gagal: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "Refresh keyserver gagal: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "gagal dearmoring: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "gagal enarmoring: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritma hash tidak valid `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[namafile]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Teruskan dan ketikkan pesan anda ....\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL sertifikasi kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL signature kebijakan yang diberikan tidak valid\n"
@@ -2928,336 +2933,341 @@ msgstr "       signature baru: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     kunci rahasia dibaca: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s signature, algoritma digest %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "kunci %08lX: tidak ada ID user\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "kunci %08lX: subkey HKP yang rusak diperbaiki\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "kunci %08lX: menerima ID user '%s' yang tidak self-signed\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "kunci %08lX: tidak ada ID user yang valid\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "mungkin disebabkan oleh self-signature yang tidak ada\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "kunci %08lX: kunci publik tidak ditemukan: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "kunci %08lX: kunci baru - dilewati\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "tidak ditemukan keyring yang dapat ditulisi: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "menulis ke `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "kunci %08lX: kunci publik \"%s\" diimpor\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "kunci %08lX: tidak cocok dengan duplikat kami\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat menemukan keyblock orisinal: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "kunci %08lX: tidak dapat membaca keyblok orisinal: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "kunci %08lX: 1 user ID baru \"%s\"\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "kunci %08lX: \"%s\" 1 signature baru\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "kunci %08lX: \"%s\" 1 subkey baru\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "kunci %08lX: \"%s\" %d subkey baru\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d signature baru\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "kunci %08lX: \"%s\" %d user ID baru\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "kunci %08lX: \"%s\" tidak berubah\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "kunci %08lX: kunci rahasia dengan cipher tidak valid %d - dilewati\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "menulis kunci rahasia ke `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "tidak ada keyring rahasia baku: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "kunci %08lX: kunci rahasia diimpor\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "kunci %08lX: sudah ada di keyring rahasia\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "kunci %08lX: kunci rahasia tidak ditemukan: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "kunci %08lX: tdk ada kunci publik-tdk dpt mengaplikasikan sertifikat "
 "pembatalan\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - ditolak\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "kunci %08lX: \"%s\" sertifikat pembatalan diimpor\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "kunci %08lX: tidak ada ID user untuk signature\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung pada user id \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "kunci %08lX: self-signature tidak valid pada user id \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "kunci %08lX: algoritma publik key tidak didukung\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "kunci %08lX: tidak ada subkey untuk key binding\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "kunci %08lX: subkey binding tidak valid\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "kunci %08lX: hapus subkey binding ganda\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "kunci %08lX: tidak ada subkey untuk pembatalan kunci\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "kunci %08lX: pembatalan subkey tidak valid\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "kunci %08lX: hapus pembatalan subkey ganda\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "kunci %08lX: melewati ID user "
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "kunci %08lX: melewati subkey\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "kunci %08lX: signature tidak dapat diekpor (kelas %02x) - dilewati\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "kunci %08lX: sertifikat pembatalan tidak valid: %s - dilewati\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "kunci %08lX: signature subkey di tempat yang salah - dilewati\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "kunci %08lX: klas signature tidak diharapkan (0x%02x) - dilewati\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "kunci %08lX: terdeteksi ID user duplikat - digabungkan\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: mengambil kunci pembatalan %08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "Peringatan: kunci %08lX dapat dibatalkan: kunci pembatalan %08lX tidak ada\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "kunci %08lX: \"%s\" penambahan sertifikat pembatalan\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "kunci %08lX: signature kunci langsung ditambahkan\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "kunci publik tidak cocok dengan kunci rahasia!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "dilewati: kunci pribadi telah ada\n"
@@ -3366,12 +3376,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" dibatalkan."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Apakah anda yakin masih ingin menandainya? (y/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "..Tidak dapat menandai.\n"
 
@@ -3585,8 +3595,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Ditandai? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "gagal menandai: %s\n"
@@ -3642,201 +3652,201 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Apakah anda ingin melakukan hal ini? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "memindahkan signature kunci ke tempat yang tepat\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "simpan dan berhenti"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "tampilkan fingerprint"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "tampilkan kunci dan ID user"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "pilih ID user N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "batalkan signature"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "tandai kunci secara lokal"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "tambah sebuah ID user"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "tambah sebuah photo ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "hapus ID user"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "hapus kunci sekunder"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "tambah kunci pembatalan"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "tandai ID user sebagai primer"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "ubah tampilan kunci rahasia dan publik"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "tampilkan preferensi (ahli)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "tampilkan preferensi (verbose)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "tidak dapat memparsing URI keyserver\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "ubah passphrase"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "ubah ownertrust"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "batalkan sebuah ID user"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "batalkan kunci sekunder"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "aktifkan kunci"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "tiadakan kunci"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "tampilkan photo ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "kesalahan membaca keyblock rahasia `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Kunci rahasia tersedia.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Perlu kunci rahasia untuk melakukan hal ini.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Silakan gunakan dulu perintah \"toogle\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3844,242 +3854,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Kunci dibatalkan"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tandai ID seluruh user? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Petunjuk: Pilih ID user untuk ditandai\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "kelas signature tidak dikenal"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Perintah ini tidak dibolehkan saat dalam mode %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Anda tidak dapat menghapus ID user terakhir!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Hapus ID user ini? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Hapus ID user ini? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "tidak dapat membuka `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "kesalahan menulis keyring `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Anda harus memilih minimum satu kunci.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Anda ingin menghapus kunci terpilih ini? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Anda ingin menghapus kunci ini? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Benar-benar hapus seluruh ID user terpilih? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Benar-benar hapus ID user ini? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Anda ingin membatalkan kunci terpilih ini? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Anda ingin membatalkan kunci ini? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "set daftar preferensi"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Perbarui preferensi untuk user ID terpilih?"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Update preferensi?"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Simpan perubahan? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Berhenti tanpa menyimpan? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "gagal memperbarui: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gagal perbarui rahasia: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Kunci tidak berubah sehingga tidak perlu pembaharuan.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Fitur: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Notasi: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Tidak ada preferensi pada user ID bergaya PGP 2.x.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Kunci ini dapat dibatalkan oleh kunci %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensitive)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "tidak dapat membuat %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [berakhir: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " trust: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Kunci ini telah ditiadakan"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4087,19 +4097,19 @@ msgstr ""
 "Perhatikan bahwa validitas kunci yang ditampilkan belum tentu benar\n"
 "kecuali anda memulai kembali program.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revoked] "
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4107,7 +4117,7 @@ msgstr ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4117,75 +4127,75 @@ msgstr ""
 "dapat menyebabkan beberapa versi\n"
 "          PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Anda tetap ingin menambahkannya? (y/n) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Anda tidak boleh menambahkan sebuah photo ID ke kunci bergaya PGP2 \n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Hapus signature baik ini? (y/T/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Hapus signature tidak valid ini? (y/T/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Hapus signature tidak dikenal ini? (y/T/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Yakin ingin menghapus self-signature ini? (y/T)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Menghapus %d signature.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Tidak ada yang dihapus.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armor tidak valid"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\" dibatalkan."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4195,207 +4205,207 @@ msgstr ""
 "designated dapat\n"
 "............menyebabkan beberapa versi PGP menolak kunci ini.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Anda tidak boleh revoker designated ke kunci bergaya PGP2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Masukkan user ID pihak yang ingin dibatalkan: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "tidak dapat menunjuk kunci bergaya PGP 2.x sebagai pihak yang dibatalkan\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "anda tidak dapat menunjuk sebuah kunci sebagai pihak yang dibatalkan "
 "sendiri\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "PERINGATAN: Kunci ini telah dibatalkan oleh pihak yang berwenang\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "PERINGATAN: menunjuk sebuah kunci sebagai pihak yang dibatalkan tidak dapat "
 "dilakukan\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Anda yakin ingin menunjuk kunci inin sebagai pihak yang dibatalkan? (y/N):"
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Silakan hapus pilihan dari kunci rahasia.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Silakan pilih maksimum satu kunci sekunder.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Merubah batas waktu untuk kunci sekunder.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Merubah batas waktu untuk kunci primer.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Anda tidak dapat merubah batas waktu kunci v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Tidak ada signature koresponden di ring rahasia\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "PERINGATAN: subkey penandatangan %08lX tidak tersertifikasi silang\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Anda harus memilih minimum satu ID user.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "melewati self-signature v3 pada user id \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Apakah anda yakin ingin menggunakannya? (y/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notasi signature: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Ditimpa (y/T)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Tidak ada ID user dengan index %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID user: "
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   ditandai oleh %08lX pada %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Kunci ini akan kadaluarsa pada %s \n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Anda tetap ingin membatalkannya? (y/n) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Membuat sertifikat pembatalan untuk signature ini? (y/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   ditandai oleh %08lX pada %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Anda telah menandai ID user ini:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (tidak dapat diekspor)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   dibatalkan oleh %08lX pada %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Anda akan membatalkan signature ini:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Ingin membuat sertifikat pembatalan? (y/T)"
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "tidak ada kunci rahasia\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "PERINGATAN: signature user ID bertanggal %d detik di masa depan\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "User ID \"%s\" telah dibatalkan\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Menampilkan photo ID %s berukuran %ld untuk kunci 0x%08lX (uid %d)\n"
@@ -5543,11 +5553,11 @@ msgstr "PERINGATAN: opsi dalam `%s' belum aktif selama pelaksanaan ini\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "tidak dapat menangani algoritma kunci publik %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "PERINGATAN: kunci sesi mungkin dienkripsi simetris secara tidak aman\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpaket tipe %d memiliki bit kritis terset\n"
@@ -5939,28 +5949,28 @@ msgstr "kunci %08lX: tidak ada ID user\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data tidak disimpan; gunakan pilihan \"--output\" untuk menyimpannya\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Menghapus signature.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Silakan masukkan nama file data: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "membaca stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "tidak ada data tertandai\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "tidak dapat membuka data tertandai `%s'\n"
diff --git a/po/it.po b/po/it.po
index 44156ffdb..f3aad1f1f 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.1.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2008-05-26 12:02+0200\n"
 "Last-Translator: Marco d'Itri <[email protected]>\n"
 "Language-Team: Italian <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "impossibile creare `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -327,7 +327,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "cambia la passphrase"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -338,107 +338,107 @@ msgstr ""
 "Opzioni:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "prolisso"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "meno prolisso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|carica il modulo di estensione FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "cerca delle chiavi su un key server"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aggiorna il database della fiducia"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -446,158 +446,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Per favore segnala i bug a <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [opzioni] [files] (-h per l'aiuto)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "file con le opzioni `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lettura delle opzioni da `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "impossibile creare la directory `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "impossibile creare %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "errore nella creazione della passhprase: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directory creata\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "trustdb: read fallita (n=%d): %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: impossibile creare la directory: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "errore leggendo `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: saltata: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent non � disponibile in questa sessione\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabile di ambiente GPG_AGENT_INFO malformata\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -805,7 +805,7 @@ msgstr "errore nella creazione della passhprase: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "impossibile aprire il file: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -820,7 +820,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "errore scrivendo il portachiavi segreto `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -830,7 +830,7 @@ msgstr "errore leggendo `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "errore leggendo `%s': %s\n"
@@ -944,11 +944,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1200,47 +1205,47 @@ msgstr "armatura inaspettata:"
 msgid "invalid dash escaped line: "
 msgstr "riga protetta con il trattino non valida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "Carattere radix64 non valido %02x saltato\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematura (nessun CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematura (nel CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC malformato\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "errore nel CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematura (nella coda)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "errore nella riga della coda\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "Non sono stati trovati dati OpenPGP validi.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armatura non valida: linea pi� lunga di %d caratteri\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1286,7 +1291,7 @@ msgstr "la chiave segreta non � disponibile"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1572,7 +1577,7 @@ msgstr "saltata: chiave pubblica gi� presente\n"
 msgid "error writing key to card: %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "abbandona questo men�"
 
@@ -1581,7 +1586,7 @@ msgstr "abbandona questo men�"
 msgid "show admin commands"
 msgstr "comandi in conflitto\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "mostra questo aiuto"
 
@@ -1661,7 +1666,7 @@ msgstr "comandi in conflitto\n"
 msgid "Admin commands are not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando non valido  (prova \"help\")\n"
 
@@ -1669,18 +1674,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1978,7 +1983,7 @@ msgstr "mostra le impronte digitali"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chiave %08lX non valida resa valida da --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2221,7 +2226,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "A chiave pubblica: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cifrari: "
 
@@ -2229,7 +2234,7 @@ msgstr "Cifrari: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compressione: "
 
@@ -2372,411 +2377,411 @@ msgstr ""
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s normalmente non deve essere usato!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "opzioni di importazione non valide\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s non � un set di caratteri valido\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "impossibile impostare exec-path a %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: opzioni di esportazione non valide\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ATTENZIONE: il programma potrebbe creare un file core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ATTENZIONE: %s ha la precedenza su %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Non � permesso usare %s con %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "Non ha senso usare %s con %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 puoi fare solo firme in chiaro o separate\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "nella modalit� --pgp2 non puoi firmare e cifrare contemporaneamente\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "devi usare dei file (e non una pipe) quando lavori con --pgp2 attivo.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 "nella modalit� --pgp2 � richiesto il cifrario IDEA per cifrare un messaggio\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "l'algoritmo di cifratura selezionato non � valido\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "l'algoritmo di digest selezionato non � valido\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve essere maggiore di 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve essere maggiore di 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve essere tra 1 e 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level non valido; deve essere 0, 1, 2 o 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level non valido; deve essere 1, 2 o 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: l'uso del modo S2K semplice (0) � fortemente scoraggiato\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K non valido; deve essere 0, 1 o 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "preferenze predefinite non valide\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "preferenze personali del cifrario non valide\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "preferenze personali del digest non valide\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "preferenze personali di compressione non valide\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s non funziona ancora con %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di cifratura \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "non � possibile usare l'algoritmo di digest \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "non � possibile usare l'algoritmo di compressione \"%s\" in modalit� %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inizializzazione del trustdb fallita: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ATTENZIONE: sono stati indicati dei destinatari (-r) senza usare la\n"
 "crittografia a chiave pubblica\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nomefile]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nomefile]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifratura fallita: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nomefile]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nomefile]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nomefile]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "non � possibile usare %s in modalit� %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nomefile]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nomefile]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nomefile]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [comandi]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "invio al keyserver fallito: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "ricezione dal keyserver fallita: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "esportazione della chiave fallita: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "ricerca nel keyserver fallita: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aggiornamento del keyserver fallito: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "rimozione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "creazione dell'armatura fallita: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo di hash non valido `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nomefile]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Vai avanti e scrivi il messaggio...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "l'URL della politica di certificazione indicato non � valido\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "l'URL della politica di firma indicato non � valido\n"
@@ -2932,339 +2937,344 @@ msgstr "           nuove firme: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  chiavi segrete lette: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "Firma %s, algoritmo di digest %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chiave %08lX: nessun user ID\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chiave %08lX: riparati i danni di HKP alla subchiave\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chiave %08lX: accettato l'user ID non autofirmato '%s'\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chiave %08lX: nessun user ID valido\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "questo pu� essere causato da una autofirma mancante\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chiave %08lX: chiave pubblica non trovata: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chiave %08lX: nuova chiave - saltata\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "non � stato trovato un portachiavi scrivibile: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scrittura in `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "errore scrivendo il portachiavi `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chiave %08lX: importata la chiave pubblica \"%s\"\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chiave %08lX: non corrisponde alla nostra copia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile individuare il keyblock originale: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chiave %08lX: impossibile leggere il keyblock originale: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chiave %08lX: \"%s\" 1 nuovo user ID\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chiave %08lX: \"%s\" una nuova firma\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chiave %08lX: \"%s\" una nuova subchiave\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chiave %08lX: \"%s\" %d nuove subchiavi\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuove firme\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chiave %08lX: \"%s\" %d nuovi user ID\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chiave %08lX: \"%s\" non cambiata\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chiave %08lX: chiave segreta con cifrario %d non valido - saltata\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "scrittura della chiave segreta in `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nessun portachiavi segreto predefinito: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chiave %08lX: chiave segreta importata\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chiave %08lX: gi� nel portachiavi segreto\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chiave %08lX: chiave segreta non trovata: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chiave %08lX: manca la chiave pubblica - impossibile applicare il\n"
 "certificato di revoca\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - rifiutato\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chiave %08lX: \"%s\" certificato di revoca importato\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chiave %08lX: nessun user ID per la firma\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chiave %08lX: algoritmo a chiave pubblica non gestito sull'user ID \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chiave %08lX: autofirma non valida sull'user ID \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chiave %08lX: algoritmo a chiave pubblica non gestito\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "chiave %08lX: non ci sono subchiavi per il legame con la chiave\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chiave %08lX: legame con la subchiave non valido:\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chiave %08lX: rimossi i legami con subochiavi multiple\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chiave %08lX: non ci sono subchiavi per la revoca della chiave\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chiave %08lX: revoca della subchiave non valida\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chiave %08lX: rimosse le revoche di subchiavi multiple\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chiave %08lX: saltato l'user ID '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chiave %08lX: saltata la subchiave\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chiave %08lX: firma non esportabile (classe %02x) - saltata\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chiave %08lX: certificato di revoca nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chiave %08lX: certificato di revoca non valido: %s - saltata\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chiave %08lX: firma della subchiave nel posto sbagliato - saltata\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chiave %08lX: classe della firma inaspettata (0x%02x) - saltata\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chiave %08lX: trovato un user ID duplicato - unito\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: scarico la chiave\n"
 "di revoca %08lX.\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ATTENZIONE: la chiave %08lX pu� essere stata revocata: la chiave di\n"
 "revoca %08lX non � presente.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chiave %08lX: certificato di revoca \"%s\" aggiunto\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chiave %08lX: aggiunta una firma alla chiave diretta\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "la chiave pubblica non corrisponde alla chiave segreta!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "saltata: chiave pubblica gi� presente\n"
@@ -3373,12 +3383,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "L'user ID \"%s\" � stato revocato."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sei ancora sicuro di volerla firmare? (s/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Impossibile firmarla.\n"
 
@@ -3590,8 +3600,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Firmo davvero? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "firma fallita: %s\n"
@@ -3647,201 +3657,201 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vuoi veramente farlo?"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "spostamento della firma di una chiave nel posto corretto\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "salva ed esci"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra le impronte digitali"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "elenca le chiavi e gli user ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "scegli l'user ID N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revoca firme"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "firma la chiave localmente"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "aggiungi un user ID"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "aggiungi un ID fotografico"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "cancella un user ID"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "cancella una chiave secondaria"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "aggiungi una chiave di revoca"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "imposta l'user ID come primario"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "cambia tra visualizzare la chiave segreta e la chiave pubblica"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "elenca le preferenze (per esperti)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "elenca le preferenze (prolisso)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "impossibile fare il parsing dell'URI del keyserver\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "cambia la passphrase"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "cambia il valore di fiducia"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revoca un user ID"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoca una chiave secondaria"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "abilita una chiave"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "disabilita una chiave"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostra l'ID fotografico"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "errore leggendo il keyblock segreto `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "� disponibile una chiave segreta.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Per fare questo serve la chiave segreta.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Per favore usa prima il comando \"toggle\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3849,242 +3859,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "La chiave � stata revocata."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Firmo davvero tutti gli user ID? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Suggerimento: seleziona gli user ID da firmare\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe della firma sconosciuta"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Questo comando non � permesso in modalit� %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Devi selezionare almeno un user ID.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Tolgo davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Tolgo davvero questo user ID? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "impossibile aprire `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "errore creando il portachiavi `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Devi selezionare almeno una chiave.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vuoi davvero cancellare le chiavi selezionate? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vuoi davvero cancellare questa chiave? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Revoco davvero tutti gli user ID selezionati? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Revoco davvero questo user ID? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vuoi davvero revocare le chiavi selezionate? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vuoi davvero revocare questa chiave? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "imposta la lista di preferenze"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Aggiorno davvero le preferenze per gli user ID selezionati? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Aggiorno davvero le preferenze? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvo i cambiamenti? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Esco senza salvare? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aggiornamento fallito: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aggiornamento della chiave segreta fallito: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "La chiave non � cambiata quindi non sono necessari aggiornamenti.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Caratteristiche: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Non esistono preferense su un user ID in stile PGP 2.x\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Questa chiave pu� essere revocata dalla chiave %s "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sensibile)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "impossibile creare %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[scadenza: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " fiducia: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Questa chiave � stata disabilitata"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4093,19 +4103,19 @@ msgstr ""
 "corretta\n"
 "finch� non eseguirai di nuovo il programma.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revocata]"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4114,7 +4124,7 @@ msgstr ""
 "            potrebbe fare diventare un altro user ID il primario "
 "predefinito.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4123,76 +4133,76 @@ msgstr ""
 "ATTENZIONE: Questa � una chiave in stile PGP2. Aggiungere un ID fotografico\n"
 "            pu� causarne il rifiuto da parte di alcune versioni di PGP.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un ID fotografico a una chiave in stile PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Cancellare questa firma corretta? (s/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Cancellare questa firma non valida? (s/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Cancellare questa firma sconosciuta? (s/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Cancellare davvero questa autofirma? (s/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Cancellata %d firma.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Cancellate %d firme.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Non � stato cancellato nulla.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armatura non valida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "L'user ID \"%s\" � stato revocato."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4202,212 +4212,212 @@ msgstr ""
 "            designato pu� causarne il rifiuto da parte di alcune versioni\n"
 "            di PGP.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "Non � possibile aggiungere un revocatore designato a una chiave in stile\n"
 "PGP 2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Inserisci l'user ID del revocatore designato: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "impossibile nominare come revocatore designato una chiave in stile PGP 2.x\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "impossibile nominare una chiave come revocatore designato di s� stessa\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 "ATTENZIONE: questa chiave � stata revocata dal suo revocatore designato!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "ATTENZIONE: la nomina di una chiave a revocatrice designata non pu� essere\n"
 "annullata.\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sei sicuro di volere nominare questa chiave revocatrice designata? (s/N):"
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Togli le selezioni dalle chiavi segrete.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Seleziona al massimo una chiave secondaria.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Cambio la data di scadenza per una chiave secondaria.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Cambio la data di scadenza per la chiave primaria.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Non � possibile cambiare la data di scadenza di una chiave v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Manca la firma corrispondente nel portachiavi segreto\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "ATTENZIONE: la sottochiave per firme %08lX non ha una certificature "
 "incrociata\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Devi selezionare esattamente un user ID.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "salto una autofirma v3 sull'user ID \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sei sicuro di volerla usare? (s/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Annotazione della firma: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sovrascrivo (s/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nessun user ID con l'indice %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "user ID: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   firmata da %08lX il %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Questa chiave � scaduta il %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sei ancora sicuro di volerlo aggiungere? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Creare un certificato di revoca per questa firma? (s/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   firmata da %08lX il %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Non puoi cancellare l'ultimo user ID!\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (non esportabile)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revocata da %08lX il %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Stai per revocare queste firme:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Creare davvero i certificati di revoca? (s/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "manca la chiave segreta\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "ATTENZIONE: una firma dell'user ID ha la data di %d secondi nel futuro\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "l'user ID \"%s\" � gi� stato revocato\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5565,13 +5575,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "impossibile gestire l'algoritmo a chiave pubblica %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ATTENZIONE: la chiave di sessione cifrata simmetricamente � potenzialmente\n"
 "non sicura\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "il sottopacchetto di tipo %d ha un bit critico impostato\n"
@@ -5967,28 +5977,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "i dati non sono stati salvati; usa l'opzione \"--output\" per salvarli\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Firma separata.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Inserisci il nome del file di dati: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "viene letto stdin...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "non ci sono dati firmati\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "impossibile aprire i dati firmati `%s'\n"
diff --git a/po/ja.po b/po/ja.po
index b47d4aff9..aa8eefb27 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.3.92\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2004-11-23 11:14+0900\n"
 "Last-Translator: IIDA Yosiaki <[email protected]>\n"
 "Language-Team: Japanese <[email protected]>\n"
@@ -125,7 +125,7 @@ msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -337,7 +337,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -348,265 +348,265 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "��Ĺ"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "����Ť�"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "�������С��θ��򸡺�����"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "���ѥǡ����١����򹹿�"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "�ѥ��ե졼���κ������顼: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "�Х��򸫤Ĥ����� <@EMAIL@> �ޤǤ���𤯤�������\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "�Ȥ���: gpg [���ץ����] [�ե�����] (�إ�פ� -h)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "����: ����Υ��ץ���󡦥ե������%s�פ�����ޤ���\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "���ץ���󡦥ե������%s��: %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��%s�פ��饪�ץ������ɤ߽Ф��ޤ�\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "������PIN�μ������顼: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "��%s�פǿ��ѥ쥳���ɤθ������顼: %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "��%s�פ���̩����񤭹��ߤޤ�\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ��Ǥ��ޤ���\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d)��%s�Ǽ��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "�ǥ��쥯�ȥ꡼��%s�פ������Ǥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: �����å�: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "���Υ��å�����gpg-agent��̵���Ǥ�\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO�Ķ��ѿ��ν񼰤�����������ޤ���\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -814,7 +814,7 @@ msgstr "�ѥ��ե졼���κ������顼: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -829,7 +829,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "���Ը�����μ������顼: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -839,7 +839,7 @@ msgstr "��%s�פ��ɽФ����顼: %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "��%s�פ��ɽФ����顼: %s\n"
@@ -952,11 +952,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1208,46 +1213,46 @@ msgstr "ͽ����������: "
 msgid "invalid dash escaped line: "
 msgstr "̵���ʥ��å���ǥ��������פ��줿��: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "̵����64��ʸ��%02X��ȤФ��ޤ���\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������ޤ���)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "�ե������������᤹���ޤ� (CRC������)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC�ν񼰤�����������ޤ���\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC���顼��%06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "�ե������������᤹���ޤ� (����������ˤ���ޤ�)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "�����ιԤ˥��顼������ޤ�\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "ͭ����OpenPGP�ǡ��������Ĥ���ޤ���\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "̵��������: �Ԥ�Ĺ����%dʸ����Ķ���Ƥ��ޤ�\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1292,7 +1297,7 @@ msgstr "OpenPGP�����ɤ�̵���Ǥ�: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP������no. %s�򸡽�\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "����ϥХå����⡼�ɤǤϤǤ��ޤ���\n"
@@ -1560,7 +1565,7 @@ msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 msgid "error writing key to card: %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "���Υ�˥塼��λ"
 
@@ -1568,7 +1573,7 @@ msgstr "���Υ�˥塼��λ"
 msgid "show admin commands"
 msgstr "�������ޥ�ɤ�ɽ��"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "���Υإ�פ�ɽ��"
 
@@ -1640,7 +1645,7 @@ msgstr "�������ޥ�ɤ����Ĥ���Ƥ��ޤ�\n"
 msgid "Admin commands are not allowed\n"
 msgstr "�������ޥ�ɤ϶ػߤ���Ƥ��ޤ�\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 
@@ -1648,18 +1653,18 @@ msgstr "̵���ʥ��ޥ�� (��help�ɤ򻲾�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "���Υ��ޥ�ɤ�--output�ϵ�ǽ���ޤ���\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1935,7 +1940,7 @@ msgstr "CA�λ���: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid��ͭ���ˤ��줿̵���ʸ�%s�Ǥ�\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "��������%s�ˤ���������̩����������ޤ��� - ̵��\n"
@@ -2181,7 +2186,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "������: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "�Ź�ˡ: "
 
@@ -2189,7 +2194,7 @@ msgstr "�Ź�ˡ: "
 msgid "Hash: "
 msgstr "�ϥå���: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "����: "
 
@@ -2331,398 +2336,398 @@ msgstr "����: �Ρ�������ä����ץ���󡦥ե������%s�פϡ�̵�뤵��ޤ�\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "����: ����%s�ϻȤ��ޤ���!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "�������С���URL�������ǽ\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "̵���ʸ������С������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "̵�����ɹ��ߥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "̵���ʽ�Ф����ץ����Ǥ�\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "̵���ʰ������ץ����Ǥ�\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "��%s�פϡ�ͭ����ʸ������ǤϤ���ޤ���\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "exec-path��%s��������ǽ\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ̵���ʸ��ڥ��ץ����Ǥ�\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "�ٹ�: �ץ������Υ������ե����뤬�Ǥ��뤳�Ȥ�����ޤ�!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "�ٹ�: %s��%s���ͥ��\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s��%s�ȤȤ�˻Ȥ����ȤϤǤ��ޤ���!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s��%s�ȤȤ�˻ȤäƤ�̵��̣�Ǥ�!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "��%s�פ���̩�������֤�񤭹��ߤޤ�\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤ�ʬΥ��̾�����ꥢ��̾���������Ǥ��ޤ���\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2�⡼�ɤǤϽ�̾�ȰŹ沽��Ʊ���ˤǤ��ޤ���\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2����ꤷ���顢(�ѥ��פǤʤ�) �ե��������ꤻ�ͤФʤ�ޤ���\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2�⡼�ɤΥ�å������Ź沽�Ǥϡ�IDEA�Ź�ˡ��ɬ�פǤ�\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "���򤵤줿�Ź楢�르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "���򤵤줿���󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "���򤵤줿���̥��르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "���򤵤줿���������󥢥르�ꥺ��ϡ�̵���Ǥ�\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed�������ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed��1����礭���ͤ�ɬ�פǤ�\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth��1����255���ϰϤǤʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "̵����default-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "̵����min-cert-level��0��1��2��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "����: ñ���S2K�⡼��(0)�λ��Ѥˤ϶���ȿ�Ф��ޤ�\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "̵����S2K�⡼�ɡ�0��1��3�Ǥʤ���Фʤ�ޤ���\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "̵���ʴ��������\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "̵���ʸĿ��ѰŹ�ˡ������\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "̵���ʸĿ������������\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "̵���ʸĿ��Ѱ��̤�����\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s��%s�ǵ�ǽ���ޤ���\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "�Ź楢�르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "���󥢥르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "���̥��르�ꥺ���%s�פ�%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "���ѥǡ����١����ν�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "�ٹ�: �������Ź��Ȥ鷺�ˡ������ (-r) ����ꤷ�Ƥ��ޤ�\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [�ե�����̾]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "��%s�פ��оΰŹ�˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "--symmetric --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [�ե�����̾]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [�ե�����̾]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--symmetric --sign --encrypt��--s2k-mode 0�ǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "--symmetric --sign --encrypt��%s�⡼�ɤǻȤ����ȤϤǤ��ޤ���\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [�ե�����̾]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [�ե�����̾]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [�ե�����̾]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key �桼����id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key �桼����id [���ޥ��]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key �桼����id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "�������С��ؤ������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "�������С�����μ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "���ν�Ф��˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "�������С��θ����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "�������С��β����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "��������˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "̵���ʥϥå��塦���르�ꥺ���%s�פǤ�\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[�ե�����̾]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "���Ϥ��ޤ�����å��������ǤäƤ������� ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "��������줿������ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "��������줿��̾�ݥꥷ��URL��̵���Ǥ�\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "���ꤵ�줿�����������С�URL��̵���Ǥ�\n"
 
@@ -2879,332 +2884,337 @@ msgstr "����ޤǤ˺������줿��̾: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  ��̩�����ɽФ�: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "�ٹ�: ��%s�ˤϡ������ԲĤȤ�������������ޤ�\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": �Ź楢�르�ꥺ������� %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": ���󥢥르�ꥺ������� %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": ���̥��르�ꥺ������� %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "it is strongly suggested that you update your preferences and\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "����Ū�ʥ��르�ꥺ���԰���������򤱤뤿�ᡢ���θ�������ۤ��Ƥ�������\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "�ʲ��ǡ������������Ǥ��ޤ�: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "��%s: �桼����ID������ޤ���\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "��%s: PKS��������¤����\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "��%s: ��������̤���ʽ�̾�Υ桼����ID��%s��\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "��%s: ͭ���ʥ桼����ID������ޤ���\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "���ʽ�̾�Τʤ������Ǥ��礦\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "��%s: �����������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "��%s: ���������Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "����߲�ǽ�ʸ��ؤ����Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "��%s�פؤν����\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "���ء�%s�פν���ߥ��顼: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "��%s: ��������%s�ɤ��ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "��%s: �������ʣ���ȹ礤�ޤ���\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å��˰��֤Ť��Ǥ��ޤ���: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "��%s: ���θ��֥��å����ɤ߽Ф��ޤ���: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "��%s:��%s�ɿ������桼����ID��1��\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "��%s:��%s�ɿ�������̾��1��\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "��%s:��%s�ɿ�����������1��\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "��%s:��%s�ɿ�����������%d��\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "��%s:��%s�ɿ�������̾��%d��\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "��%s:��%s�ɿ������桼����ID��%d��\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "��%s:��%s���ѹ��ʤ�\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "��%s: ̵���ʰŹ�ˡ%d����̩���Ǥ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "��̩�����ɹ��ߤ϶ػߤǤ�\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "�������̩���ؤ�����ޤ���: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "��%s: ��̩�����ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "��%s: �⤦��̩���ؤˤ���ޤ�\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "��%s: ��̩�������Ĥ���ޤ���: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "��%s: ������������ޤ��� - �����������Ŭ�ѤǤ��ޤ���\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "��%s: ̵���ʼ���������: %s - ����\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "��%s:��%s�ɼ�����������ɤ߹��ߤޤ���\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "��%s: ��̾���б�����桼����ID������ޤ���\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤΥ��ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "��%s: �桼����ID��%s�ɤμ��ʽ�̾����̵���Ǥ�\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "��%s: �����б���������������ޤ���\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "��%s: ���ݡ��Ȥ��Ƥ��ʤ����������르�ꥺ��Ǥ�\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "��%s: �����б���������������ޤ���\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "��%s: ̵�����������б��Ǥ�\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "��%s: ¿���������б��������ޤ�\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "��%s: �������ˤ�����������������ޤ���\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "��%s: ̵�������������Ǥ�\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "��%s: ̵����������¿�ż����������ޤ�\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "��%s: �ȤФ����桼����ID��%s��\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "��%s: �ȤФ�������\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "��%s: ��Ф��ԲĤʽ�̾ (���饹%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "��%s: ���������񤬸��ä����ꤵ��Ƥ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "��%s: ̵���ʼ���������: %s - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "��%s: ������̾�ξ�꤬�����äƤ��ޤ� - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "��%s: ͽ�����̽�̾���饹 (0x%02X) - �ȤФ��ޤ�\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "��%s: ��ʣ�����桼����ID�θ��� - ʻ��\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s�ΰ����Ф�\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "�ٹ�: ��%s�ϼ������줿�褦�Ǥ�: ������%s���Ժߡ�\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "��%s:��%s�ɼ�����������ɲ�\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "��%s: ľ�ܸ���̾���ɲ�\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "����������̩�����ȹ礷�ޤ���!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "��̩���Ϥ⤦�����ɤ��ݴɤ��Ƥ���ޤ�\n"
@@ -3313,12 +3323,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "����Ǥ⤳�θ��˽�̾�������Ǥ���? (y/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  ��̾��ǽ��\n"
 
@@ -3502,8 +3512,8 @@ msgstr "���θ��ϡ����ʤ����դ��Ƹ������ޤ�����\n"
 msgid "Really sign? (y/N) "
 msgstr "�����˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "��̾�˼��Ԥ��ޤ���: %s\n"
@@ -3559,202 +3569,202 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "�����˼¹Ԥ��ޤ���? (y/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "���ν�̾�����������˰�ư���ޤ�\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "��¸���ƽ�λ"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "�����ɽ��"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "���ȥ桼����ID�ΰ���"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "�桼����ID N������"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "��̾�μ���"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "��������Ū�˽�̾"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "�桼����ID���ɲ�"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "�ե���ID���ɲ�"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "�桼����ID�κ��"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤظ����ɲ�"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 #, fuzzy
 msgid "move a backup key to a smartcard"
 msgstr "���ޡ��ȥ����ɤθ��ؤΰ�ư"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "�����κ��"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "���������ɲ�"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "�桼����ID���ˤ���"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "��̩���ȸ������ΰ�����ȿž"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "�����ΰ��� (�������ѡ���)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "�����ΰ��� (��Ĺ)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "�����������С���URI������"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "�ѥ��ե졼�����ѹ�"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "��ͭ�Կ��Ѥ��ѹ�"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "�桼����ID�μ���"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "�����μ���"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "���λ��Ѥ���Ĥ���"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "���λ��Ѥ�ػߤ���"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "�ե���ID��ɽ��"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "��̩���֥��å���%s�ɤ��ɽФ����顼: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "��̩�������ѤǤ��ޤ���\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "���μ¹Ԥˤ���̩��������ޤ���\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "�ޤ���toggle�ɥ��ޥ�ɤ�ȤäƤ���������\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3762,160 +3772,160 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "���ϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "���������桼����ID�˽�̾���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "����: �ޤ���̾����桼����ID�����򤷤ޤ�\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "̤�Τν�̾���饹�Ǥ�"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s�⡼�ɤǤ��Υ��ޥ�ɤ϶ػߤǤ���\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "�桼����ID�򾯤ʤ��Ȥ�ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "�Ǹ�Υ桼����ID�Ϻ���Ǥ��ޤ���!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˺�����ޤ���? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "���μ縰�������˰�ư���ޤ���? (y/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "���򤭤ä���1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "��%s�פ������ޤ���: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "���ء�%s�פκ������顼: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "���򾯤ʤ��Ȥ�1�����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "���򤷤����������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "���θ��������˺�����ޤ���? (y/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "���򤷤����桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "���Υ桼����ID�������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "���򤷤����������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "���θ��������˼������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "���ѼԻ��꿮�ѥǡ����١����������桢��ͭ�Կ��Ѥ����ꤵ��ʤ����Ȥ⤢���"
 "����\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "�����ΰ���������:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "���򤷤��桼����ID�������������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "�����������˹������ޤ���? (y/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "�ѹ�����¸���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "��¸�����˽�λ���ޤ���? (y/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "�����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "��̩�ι����˼��Ԥ��ޤ���: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "����̵�ѹ��ʤΤǹ��������פǤ���\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "����: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "��ǽ: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "̵�����������С�"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "�����������С�: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr ""
@@ -3923,71 +3933,71 @@ msgstr ""
 "���ץ����:\n"
 " "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x�����桼����ID��������������ޤ���\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "���θ��ϡ�%s��%s�ˤ�äƼ������줿�褦�Ǥ�"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(�ǥꥱ����)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "��λ: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "����ˡ: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "����: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "ͭ����: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "���θ��ϻ��Ѷػߤ����ꤵ��Ƥ��ޤ�"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "�������ֹ�: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3995,17 +4005,17 @@ msgstr ""
 "�ץ�������Ƶ�ư����ޤǡ�ɽ�����줿����ͭ�������������ʤ����⤷��ʤ���\n"
 "�Ȥ������Ȥ�ǰƬ�ˤ����Ƥ���������\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "����"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "��λ"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4013,7 +4023,7 @@ msgstr ""
 "�ٹ�: �礿��桼����ID������ޤ��󡣤��Υ��ޥ�ɤϡ��̤�\n"
 "              �桼����ID����ˤʤ�Ȳ��ꤹ���礬����ޤ���\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4022,75 +4032,75 @@ msgstr ""
 "�ٹ�: �����PGP2�����θ��Ǥ����ե���ID���ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "����Ǥ��ɲä������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2�����θ��ˤϥե���ID���ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "������������̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "����̵���ʽ�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "����̤�Τν�̾�������ޤ���? (y/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "���μ��ʽ�̾�������˺�����ޤ���? (y/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d�Ĥν�̾�������ޤ�����\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "���������Ƥ��ޤ���\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "̵���������Ǥ�"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "�桼����ID��%s�ɤϡ���������Ƥ��ޤ���"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4099,195 +4109,195 @@ msgstr ""
 "�ٹ�: �����PGP 2.x�����θ��Ǥ�����̾�����Ԥ��ɲäǡ��������Ǥ�PGP�ϡ�\n"
 "      ���θ�����ݤ��뤫�⤷��ޤ���\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "PGP 2.x�����θ��ˤϻ�̾�����Ԥ��ɲäǤ��ޤ���\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "��̾�����ԤΥ桼����ID�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "PGP 2.x�����θ��ϡ���̾�����Ԥ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "��̾�����Ԥˤϡ����θ����Τ�Ǥ̿�Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "���θ��ϼ����ԤȤ��Ƥ⤦��̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "�ٹ�: ���븰���̾�����Ԥ����ꤹ��ȡ������᤻�ޤ���!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "�����ˤ��θ����̾�����Ԥ�Ǥ̿���ޤ���? (y/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "��̩���������Ȥ��Ƥ���������\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "�⡹1�Ĥ����������򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "������ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "�縰��ͭ�����¤��ѹ����ޤ���\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "v3����ͭ�����¤��ѹ��Ǥ��ޤ���\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "��̩���ؤ��б������̾������ޤ���\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "�ٹ�: ��̾����%s�ϡ���߾����Ǥ���ޤ���\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "�桼����ID�򤭤ä���ҤȤ����򤷤Ƥ���������\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "�桼����ID��%s�ɤ�v3���ʽ�̾��ȤФ��ޤ�\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "�����������С�URL�����Ϥ��Ƥ�������: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "�����˸򴹤������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "�����˺���������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "��̾����: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "��񤭤��ޤ���? (y/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d�֤Υ桼����ID�Ϥ���ޤ���\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "�桼����ID:��%s��\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s��%s%s%s�˽�̾����Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (��Ф��Բ�)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "���ν�̾��%s����λ�Ǥ���\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "����Ǥ������˼����������Ǥ���? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "���ν�̾�ˤ������뼺���������������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "�����Υ桼����ID�˸�%s�ǽ�̾���ޤ���:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (�����Բ�)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "���ʤ��θ�%s��%s�˼�������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "�����ν�̾�򼺸����褦�Ȥ��Ƥ��ޤ�:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "����������������˺������ޤ���? (y/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "��̩��������ޤ���\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "�ٹ�: �桼����ID��̾����%d��̤��Ǥ�\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "�桼����ID��%s�ɤϡ��⤦��������Ƥ��ޤ�\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "%s (�礭��%ld) �θ�%s (uid %d) �Υե���ID�Ȥ���ɽ��\n"
@@ -5414,11 +5424,11 @@ msgstr "�ٹ�: ��%s�פΥ��ץ����ϵ�ư���Ƥ���֡�ͭ���ˤʤ�ޤ���\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "�������Υ��르�ꥺ��%d�ϡ���갷���ޤ���\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "�ٹ�: ����Ū�˷��ݤ��оΰŹ沽���å���󸰤Ǥ�\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "��%d�β��̥ѥ��åȤ˥���ƥ����롦�ӥåȤ�ȯ��\n"
@@ -5791,28 +5801,28 @@ msgstr ""
 "�ǡ�������¸����Ƥ��ޤ���\n"
 "��¸����ˤϡ�--output�ɥ��ץ�����ȤäƤ�������\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "ʬΥ��̾��\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "�ǡ������ե������̾��������: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "ɸ�����Ϥ���ɽФ��� ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "��̾���줿�ǡ���������ޤ���\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "��̾���줿�ǡ�����%s�פ������ޤ���\n"
diff --git a/po/nb.po b/po/nb.po
index 760bb64ed..f2494a7a6 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.3\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2006-06-13 20:31+0200\n"
 "Last-Translator: Trond Endrest�l <[email protected]>\n"
 "Language-Team: Norwegian Bokm�l <[email protected]>\n"
@@ -125,7 +125,7 @@ msgstr "kan ikke opprette �%s�: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -337,7 +337,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "endre passfrasen"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -348,107 +348,107 @@ msgstr ""
 "Valg:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "fyldig output"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "v�re noenlunde stille"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "s�ke etter n�kler p� en n�kkelserver"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "ikke oppdat�r tillitsdatabasen etter import"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "feil ved opprettelse av passfrase: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -456,156 +456,156 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Vennligst rapporter feil til <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Bruksm�te: gpg [valg] [filer] (-h for hjelp)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "MERK: ingen standard valgfil �%s�\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "valgfil �%s�: %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "leser valg fra �%s�\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan ikke opprette �%s�: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "feil ved henting av ny PIN: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, 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:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "skriver hemmelig n�kkel til �%s�\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen �%s� ble opprettet\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) mislyktes in %s: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan ikke opprette katalogen �%s�: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: hoppet over: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -810,7 +810,7 @@ msgstr "feil ved opprettelse av passfrase: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan ikke �pne n�kkelknippet"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -825,7 +825,7 @@ msgstr ""
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -835,7 +835,7 @@ msgstr "feil ved lesing av �%s�: %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "feil ved lesing av �%s�: %s\n"
@@ -945,11 +945,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1199,46 +1204,46 @@ msgstr "uforventet armering:"
 msgid "invalid dash escaped line: "
 msgstr "ugyldig bindestrekbeskyttet linje: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "hoppet over ugyldig radix64-tegn %02x\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "for tidlig eof (ingen CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "for tidlig eof (i CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "misdannet CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-feil; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "for tidlig eof (i trailer)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "feil i trailerlinje\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "ingen gyldig OpenPGP-data funnet.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ugyldig armor: linje lengre enn %d tegn\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1281,7 +1286,7 @@ msgstr "OpenPGP-kort er ikke tilgjengelig: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kortnummer %s oppdaget\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1548,7 +1553,7 @@ msgstr "hemmelig n�kkel er allerede lagret p� et kort\n"
 msgid "error writing key to card: %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "avslutte denne menyen"
 
@@ -1556,7 +1561,7 @@ msgstr "avslutte denne menyen"
 msgid "show admin commands"
 msgstr "vise admin-kommandoer"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "vise denne hjelpen"
 
@@ -1628,7 +1633,7 @@ msgstr "Admin-kommandoer er tillatt\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Admin-kommandoer er ikke tillatt\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ugyldig kommando  (pr�v �help�)\n"
 
@@ -1636,18 +1641,18 @@ msgstr "Ugyldig kommando  (pr�v �help�)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output virker ikke for denne kommandoen\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1929,7 +1934,7 @@ msgstr "CA-fingeravtrykk: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Ugyldig n�kkel %s gjort gyldig av --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemmelig undern�kkel for offentlig undern�kkel %s - ignorerer\n"
@@ -2170,7 +2175,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Offentlig n�kkel: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cipher: "
 
@@ -2178,7 +2183,7 @@ msgstr "Cipher: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Kompresjon: "
 
@@ -2325,396 +2330,396 @@ msgstr "MERK: den gamle valgfila �%s� ble ignorert\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "MERK: %s er ikke for vanlig bruk!\n"
 
 # Tenk litt p� denne du, Trond.
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "�%s� er ikke en gyldig signaturutg�else\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "�%s� er ikke et gyldig tegnsett\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "kunne ikke parse n�kkelserverens URL\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "ugyldige valg for n�kkelserver\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ugyldige importvalg\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "ugyldige importvalg\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "ugyldige eksportvalg\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ugyldige listevalg\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "ugyldige listevalg\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "ugyldige valg for bekreftelse\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunne ikke sette exec-path til %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ugyldig auto-key-locate-liste\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ADVARSEL: programmet kan opprette en corefil!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ADVARSEL: %s overstyrere %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s er ikke tillatt sammen med %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s er ikke fornuftig med %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr ""
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "du kan bare lage adskilte eller klare signaturer i --pgp2-modus\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan ikke signere og kryptere samtidig i --pgp2-modus\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du m� bruke filer (og ikke en pipe) n�r --pgp2 er p�sl�tt\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering en melding i --pgp2-modus krever IDEA-algoritmen\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "valgt krypteringsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "valg digestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "valgt kompresjonsalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "valgt sertifikasjondigestalgoritme er ugyldig\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed m� v�re st�rre enn 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-neede m� v�re st�rre enn 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth m� v�re i intervallet fra 1 til 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "ugyldig default-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ugyldig min-cert-level; m� v�re 0, 1, 2 eller 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "MERK: enkel S2K-modus (0) er sterkt frar�det\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ugyldig S2K-modus; m� v�re 0, 1 eller 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "ugyldig standard preferanser\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "ugyldig personlig cipherpreferanser\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "ugyldig personlig digestpreferanser\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "ugyldig personlig kompresjonspreferanser\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s virker ikke enn� med %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke cipheralgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke digestalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "du kan ikke bruke kompresjonsalgoritmen �%s� i %s-modus\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "klarte ikke � initialisere tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ADVARSEL: mottakere (-r) angitt uten � bruke offentlig n�kkelkryptering\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [filnavn]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnavn]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av �%s� mislyktes: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnavn]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnavn]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmtric --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [filnavn]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnavn]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "du kan ikke bruke --symmetric --sign --encrypt i %s-modus\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnavn]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnavn]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnavn]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key brukerid"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key brukerid [kommandoer]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key brukerid"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sending til n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "mottak fra n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "n�kkeleksport mislyktes: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "s�k p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "refresh p� n�kkelserver mislyktes: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dearmoring failed: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "enarmoring failed: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ugyldig hashalgoritme �%s�\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[filnavn]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Sett i gang og tast inn meldingen din ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angitte URLen for sertifikasjonspolicyen er ugyldig\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angitte URLen for signaturpolicy er ugyldig\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angitte URLen for den foretrukkede n�kkelserveren er ugyldig\n"
 
@@ -2866,331 +2871,336 @@ msgstr "         oppryddete signaturer: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "         oppryddete brukerider: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         �%s� preferanse for digestalgoritme %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "n�kkel %s: ingen brukerid\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "n�kkel %s: PKS-undern�kkel reparert\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "n�kkel %s: akseptert ikke-selvsignert brukerid �%s�\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "n�kkel %s: ingen gyldig brukerid\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "dette kan skyldes en manglende selvsignatur\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "n�kkel %s: offentlig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "n�kkel %s: ny n�kkel - hoppet over\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "ingen skrivbart n�kkelknippe funnet: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver til �%s�\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "feil ved skriving av n�kkelknippet �%s�: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "n�kkel %s: offentlig n�kkel �%s� importert\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "n�kkel %s: stemmer ikke med v�r kopi\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke finne original n�kkelblokk: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "n�kkel %s: kan ikke lese original n�kkelblokk: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "n�kkel %s: �%s� 1 ny brukerid\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "n�kkel %s: �%s� 1 ny signatur\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "n�kkel %s: �%s� 1 ny undern�kkel\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "n�kkel %s: �%s� %d nye undern�kler\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "n�kkel %s: �%s� %d nye brukerider\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "n�kkel %s: �%s� ikke endret\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "n�kkel %s: hemmelig n�kkel med ugyldig cipher %d - hoppet over\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemmelig n�kkel er ikke tillatt\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen standard hemmelig n�kkelknippe: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "n�kkel %s: hemmelig n�kkel importert\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "n�kkel %s: finnes allerede i hemmelig n�kkelknippe\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "n�kkel %s: hemmelig n�kkel ikke funnet: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "n�kkel %s: ingen offentlig n�kkel - kan ikke anvende opphevingssertifikat\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - avvist\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat importert\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "n�kkel %s: ingen brukerid for signatur\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme for brukerid �%s�\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "n�kkel %s: ugyldig selvsignatur for brukerid �%s�\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "n�kkel %s: ust�ttet offentlig n�kkelalgoritme\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "n�kkel %s: ingen undern�kkel for n�kkelbinding\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "n�kkel %s: ugyldig undern�kkelbinding\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelbindinger\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "n�kkel %s: ingen undern�kkel for n�kkeloppheving\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "n�kkel %s: ugyldig undern�kkeloppheving\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "n�kkel %s: fjernet flere undern�kkelopphevinger\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "n�kkel %s: hoppet over brukerid �%s�\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "n�kkel %s: hoppet over undern�kkel\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "n�kkel %s: ikke-eksporterbar signatur (klasse 0x%02X) - hoppet over\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "n�kkel %s: opphevingssertifikat p� feil plass - hoppet over\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "n�kkel %s: ugyldig opphevingssertifikat: %s - hoppet over\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "n�kkel %s: undern�kkelsignatur p� feil plass - hoppet over\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "n�kkel %s: uforventet signaturklasse (0x%02X) - hoppet over\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "n�kkel %s: duplikert brukerid oppdaget - flettet sammen\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ADVARSEL: n�kkel %s kan v�re opphevet: henter opphevingsn�kkel %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "ADVARSEL: n�kkel %s kan v�re opphevet: opphevingsn�kkel %s ikke tilstede.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "n�kkel %s: �%s� opphevingssertifikat lagt til\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "n�kkel %s: direkte n�kkelsignatur lagt til\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr ""
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr ""
 
@@ -3296,12 +3306,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Brukerid �%s� er opphevet."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Er du fortsatt sikker p� at du vil signerere den? (j/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Kunne ikke signere.\n"
 
@@ -3485,8 +3495,8 @@ msgstr "Jeg har sjekket denne n�kkelen veldig n�ye.\n"
 msgid "Really sign? (y/N) "
 msgstr "Virkelig signere? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signering mislyktes: %s\n"
@@ -3536,180 +3546,180 @@ msgstr "Du �nsker ikke en passfrase - dette er sannsynligvis en *dum* id�!\n"
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vil du virkelig gj�re dette? (j/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "flytter en n�kkelsignatur til den rette plassen\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "lagre og avslutte"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "vise n�kkelens fingeravtrykk"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "liste n�kler og brukerider"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "velger brukerid N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "sjekke signaturer"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "signerere utvalgte brukerider lokalt"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "signere utvalgte brukerider med en tillitssignatur"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "legge til en brukerid"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "legge til en fotoid"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "slette utvalgte brukerider"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "legge til en undern�kkel"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "slette utvalgte undern�kler"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "legge til en opphevingsn�kkel"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "slette signaturene fra de utvalgte brukeridene"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "markere den valgte brukeriden som den prim�re"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "veksle mellom hemmelig og offentlig n�kkellisting"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "liste preferanser (ekspert)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "liste preferanser (fyldig)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "sette preferanseliste for de valgte brukeridene"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "sette URL for foretrukket n�kkelserver for de valgte brukeridene"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "sette en notasjon for de valgte brukeridene"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "endre passfrasen"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "endre eiertilliten"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "oppheve signaturene p� de valgte brukeridene"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "oppheve utvalgte brukerider"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "oppheve n�kkel eller utvalgte undern�kler"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "innkoble en n�kkel"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "utkoble en n�kkel"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "vise utvalgte fotoider"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "feil ved lesing av hemmelig n�kkelblokk �%s�: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Hemmelig n�kkel er tilgjengelig\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Trenger den hemmelige n�kkelen for � gj�re dette.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Vennligst bruk kommandoen �toggle� f�rst.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3717,512 +3727,512 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "N�kkelen er opphevet."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Virkelig signerere alle brukerider? (j/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Velg brukeriden som skal signeres\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Ukjent signaturtype �%s�\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Denne kommandoen er ikke tillatt i %s-modus.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Du m� velge minst en brukerid.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan ikke slette den siste brukeriden!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Virkelig fjerne alle valgte brukerider? (j/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Virkelig fjerne denne brukeriden? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Virkelig flytte prim�rn�kkelen? (j/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan ikke �pne �%s�: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Feil ved lesing av sikkerhetskopiert n�kkel �%s�: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Du m� velge minst en n�kkel.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vil du virkelig slette den valgte n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vil du virkelig slette denne n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Virkelig oppheve alle de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Virkelig oppheve denne brukeriden? (j/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vil du virkelig oppheve hele n�kkelen? (j/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vil du virkelig oppheve de valgte undern�klene? (j/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vil du virkelig oppheve denne undern�kkelen? (j/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "sette preferanseliste til:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Virkelig oppdatere preferansene for de valgte brukeridene? (j/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Virkelig oppdatere preferansene? (j/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Lagre endringene? (j/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Avslutte uten � lagre? (j/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "oppdatering mislyktes: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "oppdatering av hemmelig mislyktes: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "N�kkelen ble ikke endret, s� ingen oppdatering er n�dvendig.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "S�rtrekk: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Notasjoner: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Det er ingen preferanser for en PGP 2.x-aktig brukerid.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Denne n�kkelen ble opphevet den %s av %s med n�kkelen %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Denne n�kkelen kan bli opphevet av %s med n�kkelen %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(sensitiv)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "opprettet: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "opphevet: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "utgikk: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "utg�r: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "bruksm�te: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "gyldighet: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Denne n�kkelen har blitt utkoblet"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "opphevet"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "utg�tt"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Er du sikker p� at du vil legge den til? (j/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Slette denne gode signaturen? (j/N/a)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr ""
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr ""
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Slettet %d signatur.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Slettet %d signaturer.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Ingen ble slettet.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "ugyldig"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "n�kkel: %s: �%s� %d nye signaturer\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "brukerid �%s�: allerede renset\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Er du fortsatt sikker p� at du vil gj�re denne n�kkelen til en opphever? (j/"
 "N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr ""
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Vennligst velg minst en undern�kkel.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr ""
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr ""
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr ""
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hopper over v3 selvsignatur for brukerid �%s�\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Er du sikker p� at du vil erstatte den? (j/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Er du sikker p� at du vil slette den? (j/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr ""
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr ""
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr ""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr ""
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (ikke-eksporterbar)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denne signaturen utgikk den %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr ""
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (ikke-opphevbar)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr ""
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr ""
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "ingen hemmelig n�kkel\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "brukerid �%s� er allerede opphevet\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ADVARSEL: en brukeridsignatur er datert %d sekunder i fremtiden\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "N�kkelen %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undern�kkel %s er allerede opphevet.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5362,11 +5372,11 @@ msgstr "ADVARSEL: valgene i �%s� er ikke aktive under denne kj�ringen\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr ""
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr ""
@@ -5742,28 +5752,28 @@ msgstr "n�kkel %s: ingen brukerid\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr ""
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr ""
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr ""
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr ""
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr ""
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan ikke �pne �%s�: %s\n"
diff --git a/po/pl.po b/po/pl.po
index d5ced882f..59f50f26d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg-2.0.7\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2007-11-26 19:01+0100\n"
 "Last-Translator: Jakub Bogusz <[email protected]>\n"
 "Language-Team: Polish <[email protected]>\n"
@@ -121,7 +121,7 @@ msgstr "nie mo�na utworzy� ,,%s'': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -339,7 +339,7 @@ msgstr "Prosz� wprowadzi� has�o do%0Azabezpieczenia swojego nowego klucza"
 msgid "Please enter the new passphrase"
 msgstr "Prosz� wprowadzi� nowe has�o"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -348,102 +348,102 @@ msgstr ""
 "@Opcje:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "uruchomienie w trybie serwera (pierwszoplanowo)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "uruchomienie w trybie demona (w tle)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "z dodatkowymi informacjami"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "mniej komunikat�w"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "wyj�cie polece� w stylu sh"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "wyj�cie polece� w stylu csh"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|PLIK|odczyt opcji z PLIKU"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "nie odczepianie od konsoli"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "nie przechwytywanie klawiatury i myszy"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "u�ycie pliku loga dla serwera"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "u�ycie standardowego po�o�enia gniazda"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|u�ycie PGM jako programu do wprowadzania PIN-u"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|u�ycie PGM jako programu SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "nie u�ywanie SCdaemona"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "ignorowanie ��da� zmiany TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "ignorowanie ��da� zmiany ekranu X"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|przedawnienie pami�tanych PIN-�w po N sekundach"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "nie u�ywanie pami�ci PIN-�w przy podpisywaniu"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "zezwolenie klientom na oznaczanie kluczy jako \"zaufanych\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "zezwolenie na predefiniowane has�o"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "w��czenie emulacji ssh-agenta"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -451,11 +451,11 @@ msgstr "|PLIK|zapis ustawie� �rodowiska tak�e do PLIKU"
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "B��dy prosimy zg�asza� na adres <"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Wywo�anie: gpg-agent [opcje] (-h podaje pomoc)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -463,145 +463,145 @@ msgstr ""
 "Sk�adnia: gpg-agent [opcje] [polecenie [argumenty]]\n"
 "Zarz�dzanie kluczem tajnym dla GnuPG\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "podano b��dny poziom diagnostyki ,,%s''\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "UWAGA: brak domy�lnego pliku opcji ,,%s''\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "plik opcji ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "odczyt opcji z ,,%s''\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nie mo�na utworzy� katalogu ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "nie mo�na utworzy� gniazda: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "nazwa gniazda zbyt d�uga\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "b��d podczas odczytu nowego PIN-u: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "b��d podczas przypisywania gniazda do ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() nie powiod�o si�: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "nas�uchiwanie na gnie�dzie ,,%s''\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalog ,,%s'' utworzony\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() nie powiod�o si� dla ,,%s'': %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "b��d odczytu z %s: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, 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:1786
+#: agent/gpg-agent.c:1791
 #, 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:1806
+#: agent/gpg-agent.c:1811
 #, 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:1811
+#: agent/gpg-agent.c:1816
 #, 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:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, 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:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s zatrzymany\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr "brak dzia�aj�cego gpg-agenta w tej sesji\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "z�y format zmiennej �rodowiskowej GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -813,7 +813,7 @@ msgstr "b��d tworzenia potoku: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nie mo�na wykona� fdopen do odczytu na potoku: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "b��d podczas tworzenia procesu: %s\n"
@@ -828,7 +828,7 @@ msgstr "oczekiwanie na zako�czenie procesu %d nie powiod�o si�: %s\n"
 msgid "error getting exit code of process %d: %s\n"
 msgstr "b��d odczytu kodu zako�czenia procesu %d: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
@@ -838,7 +838,7 @@ msgstr "b��d uruchamiania ,,%s'': kod wyj�cia %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "b��d uruchamiania ,,%s'': prawdopodobnie nie zainstalowany\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "b��d uruchamiania ,,%s'': zako�czono\n"
@@ -947,12 +947,17 @@ msgstr "brak miejsca w bezpiecznej pami�ci podczas przydzielania %lu bajt�w"
 msgid "out of core while allocating %lu bytes"
 msgstr "brak miejsca podczas przydzielania %lu bajt�w"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 #, fuzzy
 msgid "no running gpg-agent - starting one\n"
 msgstr "dirmngr nie dzia�a - uruchamianie ,,%s''\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 #, fuzzy
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "nie mo�na po��czy� si� z dirmngr - pr�ba fallbacku\n"
@@ -1202,46 +1207,46 @@ msgstr "nieoczekiwane opakowanie: "
 msgid "invalid dash escaped line: "
 msgstr "niepoprawne oznaczenie linii minusami: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "niew�a�ciwy znak formatu radix64 ,,%02X'' zosta� pomini�ty\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "przedwczesny koniec pliku (brak CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "przedwczesny koniec pliku (w CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "b��d formatu CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "B��d sumy CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "przedwczesny koniec pliku (w linii ko�cz�cej)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "b��d w linii ko�cz�cej\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "nie odnaleziono poprawnych danych w formacie OpenPGP.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "b��d opakowania: linia d�u�sza ni� %d znak�w\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1286,7 +1291,7 @@ msgstr "Karta OpenPGP niedost�pna: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Wykryto kart� OpenPGP nr %s\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1554,7 +1559,7 @@ msgstr "klucz prywatny jest ju� zapisany na karcie\n"
 msgid "error writing key to card: %s\n"
 msgstr "b��d zapisu klucza: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "wyj�cie z tego menu"
 
@@ -1562,7 +1567,7 @@ msgstr "wyj�cie z tego menu"
 msgid "show admin commands"
 msgstr "pokazanie polece� administratora"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "ten tekst pomocy"
 
@@ -1634,7 +1639,7 @@ msgstr "Polecenia dla administratora s� dozwolone\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Polecenia dla administratora nie s� dozwolone\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 
@@ -1642,18 +1647,18 @@ msgstr "Niepoprawne polecenie  (spr�buj ,,help'')\n"
 msgid "--output doesn't work for this command\n"
 msgstr "opcja --output nie dzia�a z tym poleceniem\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1934,7 +1939,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Opcja --allow-non-selfsigned-uid wymusi�a uznanie za poprawny klucza %s.\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "brak prywatnego odpowiednika podklucza publicznego %s - pomini�ty\n"
@@ -2176,7 +2181,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Asymetryczne: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Symetryczne: "
 
@@ -2184,7 +2189,7 @@ msgstr "Symetryczne: "
 msgid "Hash: "
 msgstr "Skr�t�w: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Kompresji: "
 
@@ -2340,401 +2345,401 @@ msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 "biblioteka libgcrypt jest zbyt stara (potrzebna %s, zainstalowana %s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "UWAGA: %s nie jest do normalnego u�ytku!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr ",,%s'' nie jest poprawnym czasem wyga�ni�cia podpisu\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr ",,%s'' nie jest poprawn� nazw� zestawu znak�w\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "niezrozumia�y URL serwera kluczy\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "niepoprawne opcje serwera kluczy\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "niepoprawne opcje wczytania kluczy\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "niepoprawne opcje eksportu kluczy\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "niepoprawne opcje wypisywania\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "wy�wietlanie ID zdj�� przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "pokazywanie URL-i polityk przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "pokazywanie wszystkich adnotacji przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "pokazywanie standardowych adnotacji IETF przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "pokazywanie adnotacji u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "pokazywanie URL-i preferowanych serwer�w kluczy przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "pokazywanie poprawno�ci ID u�ytkownika przy sprawdzaniu podpis�w"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "pokazywanie uniewa�nionych i wygas�ych ID u�ytkownika przy sprawdzaniu "
 "podpis�w"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "pokazywanie tylko g��wnego ID u�ytkownika przy sprawdzaniu podpisu"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "sprawdzanie podpis�w z danymi PKA"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "zwi�kszenie zaufania podpis�w z poprawnymi danymi PKA"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "niepoprawne opcje sprawdzania\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nie mo�na ustawi� �cie�ki program�w wykonywalnych na %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "Niepoprawna lista auto-key-locate\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "OSTRZE�ENIE: program mo�e stworzy� plik zrzutu pami�ci!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "OSTRZE�ENIE: %s powoduje obej�cie %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie wolno u�ywa� %s z %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nie ma sensu w po��czeniu z %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nie zadzia�a z niebezpieczn� pami�ci� z powodu %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "w trybie --pgp2 mo�na sk�ada� tylko podpisy oddzielne lub do��czone do "
 "tekstu\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "w trybie --pgp2 nie mo�na jednocze�nie szyfrowa� i podpisywa�\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "w trybie --pgp2 trzeba u�ywa� plik�w a nie potok�w.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "szyfrowanie wiadomo�ci w trybie --pgp2 wymaga modu�u szyfru IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "wybrany algorytm szyfruj�cy jest niepoprawny\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w wiadomo�ci jest niepoprawny\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "wybrany algorytm kompresji jest niepoprawny\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "wybrany algorytm skr�t�w po�wiadcze� jest niepoprawny\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "warto�� completes-needed musi by� wi�ksza od 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "warto�� marginals-needed musi by� wi�ksza od 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "warto�� max-cert-depth musi mie�ci� si� w zakresie od 1 do 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy domy�lny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr ""
 "niew�a�ciwy minimalny poziom sprawdzania; musi mie� warto�� 0, 1, 2 lub 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "UWAGA: prosty tryb S2K (0) jest stanowczo odradzany\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "niepoprawny tryb S2K; musi mie� warto�� 0, 1 lub 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "niew�a�ciwe domy�lne ustawienia\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "niew�a�ciwe ustawienia szyfr�w\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "niew�a�ciwe ustawienia skr�t�w\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "niew�a�ciwe ustawienia algorytm�w kompresji\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s jeszcze nie dzia�a z %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "szyfr ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "skr�t ,,%s'' nie jest dost�pny w trybie %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "kompresja ,,%s'' nie jest dost�pna w trybie %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "inicjowanie Bazy Zaufania nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "OSTRZE�ENIE: podano adresat�w (-r) w dzia�aniu kt�re ich nie dotyczy\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [plik]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [plik]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "szyfrowanie symetryczne ,,%s'' nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [plik]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [plik]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [plik]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [plik]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [plik]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt wraz z --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nie mo�na u�y� --symmetric --sign --encrypt w trybie %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [plik]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [plik]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [plik]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key nazwa u�ytkownika [polecenia]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key nazwa u�ytkownika"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "wysy�ka do serwera kluczy nie powiod�a si�: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "odbi�r z serwera kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "eksport kluczy nie powi�d� si�: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "szukanie w serwerze kluczy nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "od�wie�enie kluczy z serwera nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zdj�cie opakowania ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "opakowywanie ASCII nie powiod�o si�: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "niew�a�ciwy algorytm skr�tu ,,%s''\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nazwa pliku]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Wpisz tutaj swoj� wiadomo�� ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "podany URL regulaminu po�wiadczania jest niepoprawny\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "podany URL regulaminu podpis�w jest niepoprawny\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "podany preferowany URL serwera kluczy jest niepoprawny\n"
 
@@ -2886,7 +2891,7 @@ msgstr "     podpis�w wyczyszczonych: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "ID u�ytkownika wyczyszczonych: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2895,331 +2900,336 @@ msgstr ""
 "OSTRZE�ENIE: klucz %s zawiera preferencje dla niedost�pnych\n"
 "algorytm�w dla tych ID u�ytkownika:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         ,,%s'': preferowany szyfr %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         ,,%s'': preferowany algorytm skr�tu %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         ,,%s'': preferowany algorytm kompresji %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "zdecydowanie sugerowane jest uaktualnienie ustawie� i ponowne\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "rozes�anie tego klucza w celu unikni�cia niezgodno�ci algorytm�w\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "mo�na uaktualni� swoje ustawienia poprzez: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "klucz %s: brak identyfikatora u�ytkownika\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "klucz %s: podklucz uszkodzony przez serwer zosta� naprawiony\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "klucz %s: przyj�to identyfikator nie podpisany nim samym ,,%s''\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "klucz %s: brak poprawnych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "to mo�e by� spowodowane brakiem podpisu klucza nim samym\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "klucz %s: brak klucza publicznego: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "klucz %s: nowy klucz - pomini�ty\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "brak zapisywalnego zbioru kluczy: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapis do ,,%s''\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "b��d zapisu zbioru kluczy ,,%s'': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "klucz %s: klucz publiczny ,,%s'' wczytano do zbioru\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "klucz %s: nie zgadza si� z lokaln� kopi�\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "klucz %s: brak oryginalnego bloku klucza; %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "klucz %s: nie mo�na odczyta� oryginalnego bloku klucza: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "klucz %s: ,,%s'' 1 nowy identyfikator u�ytkownika\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "klucz %s: ,,%s'' %d nowych identyfikator�w u�ytkownika\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "klucz %s: ,,%s'' 1 nowy podpis\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "klucz %s: ,,%s'' %d nowych podpis�w\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "klucz %s: ,,%s'' 1 nowy podklucz\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "klucz %s: ,,%s'' %d nowych podkluczy\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "klucz %s: ,,%s'' %d podpis wyczyszczony\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "klucz %s: ,,%s'' %d podpis�w wyczyszczonych\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "klucz %s: ,,%s'' %d identyfikator u�ytkownika wyczyszczony\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "klucz %s: ,,%s'' %d identyfikator�w u�ytkownika wyczyszczonych\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "klucz %s: ,,%s'' bez zmian\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "klucz %s: klucz tajny z b��dnym szyfrem %d - pomini�ty\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "wczytywanie kluczy tajnych nie jest dozwolone\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "brak domy�lnego zbioru kluczy tajnych: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "klucz %s: klucz tajny wczytany do zbioru\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "klucz %s: ten klucz tajny ju� znajduje si� w zbiorze\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "klucz %s: brak klucza tajnego: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "klucz %s: brak klucza publicznego kt�rego dotyczy wczytany certyfikat\n"
 "              uniewa�nienia\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "klucz %s: niepoprawny certyfikat uniewa�nienia: %s - odrzucony\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "klucz %s: ,,%s'' certyfikat uniewa�nienia zosta� ju� wczytany\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "klucz %s: brak identyfikatora u�ytkownika do podpisu\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "klucz %s: algorytm asymetryczny dla id ,,%s'' nie jest obs�ugiwany\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "klucz %s: niepoprawny podpis na identyfikatorze ,,%s''\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "klucz %s: brak podklucza do dowi�zania\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "klucz %s: nieobs�ugiwany algorytm asymetryczny\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "klucz %s: dodano bezpo�redni podpis\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "klucz %s: brak podklucza do dowi�zania\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "klucz %s: niepoprawne dowi�zanie podklucza\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "klucz %s: usuni�to wielokrotne dowi�zanie podklucza\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "klucz %s: brak podklucza, kt�rego dotyczy uniewa�nienie\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "klucz %s: niepoprawne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "klucz %s: usuni�to wielokrotne uniewa�nienie podklucza\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "klucz %s: pomini�to identyfikator u�ytkownika ,,%s''\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "klucz %s: podklucz pomini�ty\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "klucz %s: podpis nieeksportowalny (klasy 0x%02X) - pomini�ty\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr ""
 "klucz %s: pomini�to certyfikat uniewa�nienia umieszczony\n"
 "              w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "klucz %s: pomini�to -  niepoprawny certyfikat uniewa�nienia: %s\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "klucz %s: pomini�to - podpis na podkluczu w niew�a�ciwym miejscu\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "klucz %s: pomini�to - nieoczekiwana klasa podpisu (0x%02X)\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "key %s: do��czono powt�rzony identyfikator u�ytkownika\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %s m�g� zosta� uniewa�niony:\n"
 "             zapytanie o uniewa�niaj�cy klucz %s w serwerze kluczy\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "OSTRZE�ENIE: klucz %s m�g� zosta� uniewa�niony:\n"
 "             brak uniewa�niaj�cego klucza %s.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "klucz %s: ,,%s'' dodany certyfikat uniewa�nienia\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "klucz %s: dodano bezpo�redni podpis\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "UWAGA: numer seryjny klucza nie zgadza si� z numerem karty\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "UWAGA: klucz g��wny jest aktywny i zapisany na karcie\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "UWAGA: klucz dodatkowy jest aktywny i zapisany na karcie\n"
 
@@ -3329,12 +3339,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Identyfikator u�ytkownika ,,%s'' zosta� uniewa�niony."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Czy na pewno chcesz podpisa�? (t/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr " Nie da si� z�o�y� podpisu.\n"
 
@@ -3523,8 +3533,8 @@ msgstr "To�samo�� u�ytkownika zosta�a dok�adnie sprawdzona.\n"
 msgid "Really sign? (y/N) "
 msgstr "Czy na pewno podpisa�? (t/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "z�o�enie podpisu nie powiod�o si�: %s\n"
@@ -3579,192 +3589,192 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Czy na pewno chcesz to zrobi�? (t/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "przenosz� podpis klucza na w�a�ciwe miejsce\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "zapis zmian i wyj�cie"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "okazanie odcisku klucza"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "lista kluczy i identyfikator�w u�ytkownika"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "wyb�r identyfikatora u�ytkownika N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "wyb�r podklucza N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "sprawdzenie podpis�w"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "z�o�enie podpisu na wybranych identyfikatorach u�ytkownika [* poni�ej "
 "powi�zane polecenia]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr ""
 "z�o�enie prywatnego (lokalnego) podpisu na wybranych identyfikatorach "
 "u�ytkownika"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� zaufania"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "podpisanie wybranych identyfikator�w u�ytkownika sygnatur� nie podlegaj�c� "
 "uniewa�nieniu"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "dodanie nowego identyfikatora u�ytkownika do klucza"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "dodanie zdj�cia u�ytkownika do klucza"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "usuni�cie wybranych identyfikator�w u�ytkownika z klucza"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "dodanie podklucza"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "dodanie klucza do karty procesorowej"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "przeniesienie klucza na kart� procesorow�"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "przeniesienie klucza zapasowego na kart� procesorow�"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "usuni�cie wybranych podkluczy"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "dodanie klucza uniewa�niaj�cego"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "usuni�cie podpis�w z wybranych identyfikator�w u�ytkownika"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "zmiana daty wyga�ni�cia dla klucza lub wybranych podkluczy"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "oznaczenie wybranego identyfikatora u�ytkownika jako g��wnego"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "prze��czenie pomi�dzy listami kluczy tajnych i publicznych"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "ustawienia (zaawansowane)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "rozbudowana lista ustawie�"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "ustawienie listy preferencji dla wybranych identyfikator�w u�ytkownika"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "ustawienie URL-a preferowanego serwera kluczy dla wybranych identyfikator�w "
 "u�ytkownika"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "ustawienie adnotacji dla wybranych identyfikator�w u�ytkownika"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "zmiana has�a klucza"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "zmiana zaufania w�a�ciciela"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "uniewa�nienie podpis�w na wybranych identyfikatorach u�ytkownika"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "uniewa�nienie wybranych identyfikator�w u�ytkownika"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "uniewa�nienie klucza lub wybranych podkluczy"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "w��czenie klucza do u�ycia"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "wy��czenie klucza z u�ycia"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "okazanie wybranych identyfikator�w - zdj��"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "zag�szczanie bezu�ytecznych ID u�ytkownik�w i usuwanie bezu�ytecznych "
 "podpis�w z kluczy"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "zag�szczanie bezu�ytecznych ID u�ytkownik�w i usuwanie wszystkich podpis�w z "
 "kluczy"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "b��d odczytu bloku klucza tajnego ,,%s'': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Dost�pny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Do wykonania tej operacji potrzebny jest klucz tajny.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Najpierw trzeba u�y� polecenia \"prze�\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3777,103 +3787,103 @@ msgstr ""
 "(ltsign,\n"
 "  tnrsign itd.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Klucz uniewa�niony."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Czy na pewno podpisa� wszystkie identyfikatory u�ytkownika? (t/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Podpowied�: wybierz identyfikatory u�ytkownika do podpisania.\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Nieznany rodzaj podpisu ,,%s''\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "To polecenie nie jest dost�pne w trybie %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Musisz wybra� co najmniej jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Nie mo�esz usun�� ostatniego identyfikatora u�ytkownika!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno usun�� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Czy na pewno usun�� ten identyfikator u�ytkownika? (t/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Czy na pewno przenie�� g��wny klucz (t/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Musisz wybra� dok�adnie jeden klucz.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Polecenie oczekuje argumentu b�d�cego nazw� pliku\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nie mo�na otworzy� ,,%s'': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "B��d podczas odczytu klucza zapasowego z `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Musisz wybra� co najmniej jeden klucz.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Czy na pewno chcesz usun�� wybrane klucze? (t/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Czy na pewno chcesz usun�� ten klucz? (t/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno uniewa�ni� wszystkie wybrane identyfikatory u�ytkownika? (t/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Czy na pewno uniewa�ni� ten identyfikator u�ytkownika? (t/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ca�y klucz? (t/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� wybrane podklucze? (t/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Czy na pewno chcesz uniewa�ni� ten podklucz? (t/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 #, fuzzy
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
@@ -3881,126 +3891,126 @@ msgstr ""
 "dostarczonej\n"
 "przez u�ytkownika\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Ustawienie listy ustawie� na:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Czy na pewno uaktualni� ustawienia dla wybranych identyfikator�w? (t/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Czy na pewno uaktualni� ustawienia? (t/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Zapisa� zmiany? (t/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Wyj�� bez zapisania zmian? (t/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "zapis zmian nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "zapis zmian na kluczu prywatnym nie powi�d� si�: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Klucz nie zosta� zmieniony wi�c zapis zmian nie jest konieczny.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Skr�t: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Ustawienia: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "no-modify dla serwera kluczy"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Preferowany serwer kluczy: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Klucze PGP 2.x nie zawieraj� opisu ustawie�.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Ten klucz zosta� uniewa�niony %s przez klucz %s u�ytkownika %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Klucz mo�e zosta� uniewa�niony przez klucz %s u�ytkownika %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(poufne)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "utworzono: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "uniewa�niono: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "wygas�: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "wygasa: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "u�ycie: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "zaufanie: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "poprawno��: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Ten klucz zosta� wy��czony z u�ytku"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "nr-karty: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4008,17 +4018,17 @@ msgstr ""
 "Pokazana warto�� wiarygodno�ci klucza mo�e by� niepoprawna,\n"
 "dop�ki program nie zostanie uruchomiony ponownie.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "uniewa�niony"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "wygas�"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4027,7 +4037,7 @@ msgstr ""
 "             jako g��wny. Wykonanie tego polecenie mo�e wi�c spowodowa�\n"
 "             wy�wietlanie innego identyfikatora jako domy�lnego g��wnego.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4036,74 +4046,74 @@ msgstr ""
 "OSTRZE�ENIE: To jest klucz PGP wersji 2. Dodanie zdj�cia spowoduje, �e\n"
 "             niekt�re wersje przestan� go rozumie�.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Czy dalej chcesz je doda�? (t/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na doda� zdj�cia.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Usun�� ten poprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Usun�� ten niepoprawny podpis? (t/N/w) "
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Usun�� ten nieznany podpis? (t/N/w) "
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Na pewno usun�� ten podpis klucza nim samym? (t/N) "
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d podpis usuni�ty.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d podpis�w usuni�tych.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nic nie zosta�o usuni�te.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "niepoprawny"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Identyfikator u�ytkownika ,,%s'' upakowany: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis wyczyszczony\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': %d podpis�w wyczyszczonych\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� zmniejszony.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Identyfikator u�ytkownika ,,%s'': ju� czysty.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4113,195 +4123,195 @@ msgstr ""
 "             uniewa�niaj�cego spowoduje, �e niekt�re wersje PGP przestan�\n"
 "             go rozumie�.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Do klucza dla PGP 2.x nie mo�na wyznaczy� klucza uniewa�niaj�cego.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Podaj identyfikator klucza uniewa�niaj�cego: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "klucza PGP 2.x nie mo�na wyznaczy� jako uniewa�niaj�cego\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nie mo�na wyznaczy� klucza do uniewa�niania jego samego\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "ten klucz zosta� ju� uznany kluczem uniewa�niaj�cym\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "OSTRZE�ENIE: nie mo�na cofn�� wyznaczenia klucza jako uniewa�niaj�cego!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Czy na pewno chcesz wyznaczy� ten klucz jako uniewa�niaj�cy? (t/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Prosz� usun�� znacznik wyboru z kluczy prywatnych.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Prosz� wybra� najwy�ej jeden podklucz.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Zmiana daty wa�no�ci podklucza.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Zmiana daty wa�no�ci g��wnego klucza.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nie mo�na zmieni� daty wa�no�ci klucza w wersji 3.\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Brak odpowiadaj�cego podpisu w zbiorze kluczy prywatnych\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "podklucz podpisuj�cy %s jest ju� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "podklucz %s nie jest podpisuj�cy, wi�c nie musi by� skro�nie podpisany\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Prosz� wybra� dok�adnie jeden identyfikator u�ytkownika.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "podpis w wersji 3 na identyfikatorze ,,%s'' zostaje pomini�ty\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Podaj preferowany URL serwera kluczy: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Czy na pewno chcesz go zast�pi�? (t/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Czy na pewno chcesz go usun��? (t/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Adnotacje: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "Kontynuowa�? (t/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Brak identyfikatora u�ytkownika o numerze %d.\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Brak identyfikatora u�ytkownika o skr�cie %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Brak podklucza o numerze %d.\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "identyfikator u�ytkownika: ,,%s''\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "podpisany twoim kluczem %s w %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (podpis nieeksportowalny) "
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Wa�no�� tego klucza wygas�a %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Czy dalej chcesz go uniewa�ni�? (t/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Stworzy� certyfikat uniewa�nienia tego podpisu? (t/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Te identyfikatory na kluczu %s s� podpisane przez Ciebie:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (podpis nieuniewa�nialny) "
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "uniewa�niony przez tw�j klucz %s w %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Czy na pewno chcesz uniewa�ni� te podpisy:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Na pewno utworzy� certyfikaty uniewa�nienia ? (t/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "brak klucza tajnego\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "identyfikator u�ytkownika ,,%s'' zosta� ju� uniewa�niony\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "OSTRZE�ENIE: identyfikator u�ytkownika podpisany za %d sekund (w "
 "przysz�o�ci)\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Klucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Podklucz %s jest ju� uniewa�niony.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5451,13 +5461,13 @@ msgstr "OSTRZE�ENIE: opcje w ,,%s'' nie s� jeszcze uwzgl�dnione.\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "nie mo�na obs�u�y� tego algorytmu klucza publicznego: %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "OSTRZE�ENIE: symetrycznie zaszyfrowany klucz sesyjny mo�e nie by� "
 "bezpieczny\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpakiet typu %d ma ustawiony krytyczny bit\n"
@@ -5838,28 +5848,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "dane nie zosta�y zapisane; aby to zrobi�, nale�y u�y� opcji \"--output\"\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Podpis oddzielony od danych.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Nazwa pliku danych: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "czytam strumie� standardowego wej�cia\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "brak podpisanych danych\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nie mo�na otworzy� podpisanego pliku ,,%s''\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nie mo�na otworzy� podpisanych danych z fd=%d: %s\n"
diff --git a/po/pt.po b/po/pt.po
index ed7068474..04ff1e4f0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2002-09-13 18:26+0100\n"
 "Last-Translator: Pedro Morais <[email protected]>\n"
 "Language-Team: pt <[email protected]>\n"
@@ -124,7 +124,7 @@ msgstr "imposs�vel criar `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -330,7 +330,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -341,108 +341,108 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FICHEIRO|carregar m�dulo de extens�o FICHEIRO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "procurar chaves num servidor de chaves"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizar a base de dados de confian�a"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -450,158 +450,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [ficheiros] (-h para ajuda)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "ficheiro de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "a ler op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro ao enviar para `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: directoria criada\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: imposs�vel criar directoria: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: ignorado: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "vari�vel de ambiente GPG_AGENT_INFO inv�lida\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -809,7 +809,7 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir %s: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -824,7 +824,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro ao escrever no porta-chaves secreto `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -834,7 +834,7 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -949,11 +949,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1205,47 +1210,47 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "fim de ficheiro prematuro (sem CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "fim de ficheiro prematuro (no CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de ficheiro prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "erro na �ltima linha\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1291,7 +1296,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1576,7 +1581,7 @@ msgstr "ignorado: a chave secreta j� est� presente\n"
 msgid "error writing key to card: %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -1585,7 +1590,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos em conflito\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -1665,7 +1670,7 @@ msgstr "comandos em conflito\n"
 msgid "Admin commands are not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1673,18 +1678,18 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output n�o funciona para este comando\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1972,7 +1977,7 @@ msgstr "mostra impress�o digital"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Chave inv�lida %08lX tornada v�lida por --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para a chave p�blica \"%s\"!\n"
@@ -2218,7 +2223,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Chave p�blica: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cifra: "
 
@@ -2226,7 +2231,7 @@ msgstr "Cifra: "
 msgid "Hash: "
 msgstr "Dispers�o: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compress�o: "
 
@@ -2368,410 +2373,410 @@ msgstr "NOTA: o ficheiro antigo de op��es por omiss�o `%s' foi ignorado\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "op��es de importa��o inv�lidas\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "n�o foi poss�vel alterar o exec-path para %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op��es de exporta��o inv�lidas\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um ficheiro core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVISO: %s sobrep�e %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "s� pode fazer assinaturas separadas ou em texto puro no modo --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "n�o pode assinar e cifrar ao mesmo tempo no modo --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "deve utilizar ficheiros (e n�o um 'pipe') quando trabalho no modo --pgp2.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrar uma mensagem no modo --pgp2 necessita da cifra IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado � inv�lido\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de cifragem selecionado � inv�lido\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" de certifica��o selecionado � inv�lido\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "n�vel de verifica��o por omiss�o inv�lido: deve ser 0, 1, 2 ou 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "prefer�ncias por omiss�o inv�lidas\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "prefer�ncias pessoais de cifra inv�lidas\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "prefer�ncias pessoais de 'digest' inv�lidas\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "prefer�ncias pessoais de compress�o inv�lidas\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar a base de dados de confian�a: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVISO: destinat�rios (-r) dados sem utilizar uma cifra de chave p�blica\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nome_do_ficheiro]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "decifragem falhou: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "n�o pode utilizar %s enquanto estiver no modo %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nome_do_ficheiro]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_ficheiro]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_ficheiro]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizador"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizador [comandos]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-utilizador"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de dispers�o inv�lido `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nome_do_ficheiro]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Digite a sua mensagem ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica de certifica��o dada � inv�lida\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica de assinatura dada � inv�lida\n"
@@ -2927,338 +2932,343 @@ msgstr "        novas assinaturas: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: \"%s\"\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de utilizador\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: subchave HKP corrompida foi reparada\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceite ID de utilizador sem auto-assinatura '%s'\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de utilizadores v�lidos\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: chave nova - ignorada\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n�o foi encontrada nenhum porta-chaves onde escrever: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "a escrever para `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do porta-chaves `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica \"%s\" importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: \"%s\" 1 novo ID de utilizador\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: \"%s\" 1 nova assinatura\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: \"%s\" 1 nova subchave\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: \"%s\" %d novas subchaves\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novas assinaturas\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: \"%s\" %d novos IDs de utilizadores\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: \"%s\" n�o modificada\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta com cifra inv�lida %d - ignorada\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "a escrever chave privada para `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "sem porta-chaves p�blico por omiss�o: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no porta-chaves secreto\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: \"%s\" certificado de revoga��o importado\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de utilizador para assinatura\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "chave %08lX: algoritmo de chave p�blica n�o suportado no utilizador \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida do utilizador \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "chave %08lX: assinatura directa de chave adicionada\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: apagada liga��o m�ltipla de subchave \n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para revoca��o de chave\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX: revoca��o de subchave inv�lida\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: removida revoga��o m�ltiplace de subchaves\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de utilizador '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorado\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorado\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: assintura da subchave no local errado - ignorado\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: classe de assinatura inesperada (%02x) - ignorada\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de utilizador duplicado - fundido\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: a transferir a chave de revoca��o %"
 "08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVISO: a chave %08lX pode estar revocada: chave de revoca��o %08lX n�o "
 "presente.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o \"%s\" adicionado\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: assinatura directa de chave adicionada\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3367,12 +3377,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Utilizador \"%s\" est� revocado."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  N�o foi poss�vel assinar.\n"
 
@@ -3584,8 +3594,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3641,204 +3651,204 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� quer realmente fazer isso? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "a mover a assinatura da chave para o local correcto\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de utilizadores"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de utilizador N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "adiciona um novo ID de utilizador"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "adiciona um identificador fotogr�fico"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de utilizador"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "adiciona uma chave de revoca��o"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "seleccionar o identificador do utilizador como prim�rio"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias (perito)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias (detalhadamente)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "n�o consegui processar a URI do servidor de chaves\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revocar um ID de utilizador"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "activa uma chave"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "desactiva uma chave"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "mostrar identificador fotogr�fico"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura do bloco de chave secreto `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Por favor utilize o comando \"toggle\" primeiro.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3846,243 +3856,243 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "A chave est� revogada."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de utilizador? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de utilizador para assinar\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Este comando n�o � permitido no modo %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de utilizador.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de utilizador!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de utilizador? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro ao criar porta-chaves `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� quer realmente remover as chaves selecionadas? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� quer realmente remover esta chave? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente revocar todos os IDs de utilizador seleccionados? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente revocar este ID de utilizador? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� quer realmente revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� quer realmente revogar esta chave? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "configurar lista de prefer�ncias"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Realmente actualizar as prefer�ncias para os utilizadores seleccionados?"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente actualizar as prefer�ncias?"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Gravar altera��es? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem gravar? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma actualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "'Digest': "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Caracter�sticas: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "N�o h� prefer�ncias no ID de utilizador tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Esta chave pode ser revogada pela chave %s "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr " (sens�vel)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "[expira: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " confian�a: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Esta chave foi desactivada"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4090,25 +4100,25 @@ msgstr ""
 "N�o se esque�a que a validade de chave mostrada n�o � necess�riamente a\n"
 "correcta a n�o ser que reinicie o programa.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4117,76 +4127,76 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP2. Se adicionar um identificador fotogr�fico\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Tem a certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 "N�o pode adicionar um identificador fotogr�fico a uma chave tipo PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Apagar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Apagar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Apagar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Utilizador \"%s\" est� revocado."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4195,203 +4205,203 @@ msgstr ""
 "AVISO: Esta chave � do tipo PGP 2.x. Se adicionar um revogador designado\n"
 "       algumas vers�o do PGP podem rejeit�-la.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "N�o pode adicionar um revogador designado a uma chave tipo PGP 2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Insira o ID de utilizador do revogador escolhido: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "n�o pode escolher uma chave do tipo PGP 2.x como revogadora\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 #, fuzzy
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as selec��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor seleccione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "A modificar a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificar a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no porta-chaves secreto\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "n�o pode escolher uma chave como revogadora de si mesmo\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Seleccione exactamente um identificador de utilizador.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "a ignorar auto-assinatura v3 no utilizar com o id \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer adicion�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o de assinatura: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Escrever por cima (s/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de utilizador com �ndice %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de utilizador: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta assinatura expirou em %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Tem a certeza de que quer revog�-la de qualquer forma? (s/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Assinou estes identificadores de utilizadores:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "  (n�o-export�vel)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente criar os certificados de revoga��o? (s/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVISO: a assintura do ID do utilizador tem data %d segundos no futuro\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "o utilizador com o id \"%s\" j� est� revocado\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5554,11 +5564,11 @@ msgstr "AVISO: op��es em `%s' ainda n�o est�o activas nesta execu��o\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5950,28 +5960,28 @@ msgstr "chave %08lX: sem ID de utilizador\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o gravados; use a op��o \"--output\" para grav�-los\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do ficheiro de dados: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "lendo do \"stdin\" ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "n�o h� dados assinados\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d5b1aa28f..19d145fd4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2007-08-16 11:35+0200\n"
 "Last-Translator:\n"
 "Language-Team: ?\n"
@@ -128,7 +128,7 @@ msgstr "imposs�vel criar %s: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -335,7 +335,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "muda a frase secreta"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -346,107 +346,107 @@ msgstr ""
 "Op��es:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "detalhado"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "ser mais silencioso"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|ARQUIVO|carregar m�dulo de extens�o ARQUIVO"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "exportar chaves para um servidor"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "atualizar o banco de dados de confiabilidade"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -454,156 +454,156 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Por favor comunique bugs para <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Uso: gpg [op��es] [arquivos] (-h para ajuda)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "arquivo de op��es `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "lendo op��es de `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, fuzzy, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: imposs�vel criar diret�rio: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, fuzzy, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "Certificado de revoga��o v�lido"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "erro na cria��o da frase secreta: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: diret�rio criado\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "\t%lu chaves ignoradas\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, fuzzy, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -810,7 +810,7 @@ msgstr "erro na cria��o da frase secreta: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "imposs�vel abrir arquivo: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -825,7 +825,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -835,7 +835,7 @@ msgstr "erro na leitura de `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "erro na leitura de `%s': %s\n"
@@ -948,11 +948,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1211,47 +1216,47 @@ msgstr "armadura inesperada:"
 msgid "invalid dash escaped line: "
 msgstr "linha com h�fen inv�lida: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caractere radix64 inv�lido %02x ignorado\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "fim de arquivo prematuro (sem CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "fim de arquivo prematuro (no CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC malformado\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "erro de CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "fim de arquivo prematuro (no \"Trailer\")\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "erro na linha \"trailer\"\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "nenhum dado OpenPGP v�lido encontrado.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armadura inv�lida: linha maior que %d caracteres\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1299,7 +1304,7 @@ msgstr "chave secreta n�o dispon�vel"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1584,7 +1589,7 @@ msgstr "ignorado: a chave secreta j� est� presente\n"
 msgid "error writing key to card: %s\n"
 msgstr "erro na escrita do chaveiro `%': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "sair deste menu"
 
@@ -1593,7 +1598,7 @@ msgstr "sair deste menu"
 msgid "show admin commands"
 msgstr "comandos conflitantes\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "mostra esta ajuda"
 
@@ -1674,7 +1679,7 @@ msgid "Admin commands are not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
 # help ou ajuda ???
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comando inv�lido (tente \"help\")\n"
 
@@ -1682,18 +1687,18 @@ msgstr "Comando inv�lido (tente \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr ""
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, fuzzy, c-format
 msgid "error reading keyblock: %s\n"
@@ -1977,7 +1982,7 @@ msgstr "Impress�o digital:"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "h� uma chave secreta para esta chave p�blica!\n"
@@ -2227,7 +2232,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr ""
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr ""
 
@@ -2235,7 +2240,7 @@ msgstr ""
 msgid "Hash: "
 msgstr ""
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 #, fuzzy
 msgid "Compression: "
 msgstr "Coment�rio: "
@@ -2378,419 +2383,419 @@ msgstr "NOTA: arquivo de op��es padr�o `%s' inexistente\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOTA: %s n�o � para uso normal!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "imposs�vel escrever para o chaveiro: %s\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, fuzzy, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 #, fuzzy
 msgid "invalid import options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, fuzzy, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 #, fuzzy
 msgid "invalid export options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "armadura inv�lida"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s n�o � um conjunto de caracteres v�lido\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "chaveiro inv�lido"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr ""
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "AVISO: `%s' � um arquivo vazio\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVISO: O programa pode criar um arquivo core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr ""
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s n�o � permitido com %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr ""
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 #, fuzzy
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "o algoritmo de \"digest\" selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed deve ser maior que 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed deve ser maior que 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth deve estar na entre 1 e 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 #, fuzzy
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 #, fuzzy
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOTA: o modo S2K simples (0) n�o � recomend�vel\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "modo S2K inv�lido: deve ser 0, 1 ou 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 #, fuzzy
 msgid "invalid default preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 #, fuzzy
 msgid "invalid personal cipher preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 #, fuzzy
 msgid "invalid personal digest preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 #, fuzzy
 msgid "invalid personal compress preferences\n"
 msgstr "lista prefer�ncias"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, fuzzy, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s n�o faz sentido com %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "o algoritmo de criptografia selecionado n�o � v�lido\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "falha ao inicializar o banco de dados de confiabilidade: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nome_do_arquivo]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "descriptografia falhou: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nome_do_arquivo]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 #, fuzzy
 msgid "--sign --symmetric [filename]"
 msgstr "--symmetric [nome_do_arquivo]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nome_do_arquivo]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nome_do_arquivo]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-usu�rio"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-usu�rio [comandos]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-usu�rio"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, fuzzy, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, fuzzy, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, fuzzy, c-format
 msgid "key export failed: %s\n"
 msgstr "A gera��o de chaves falhou: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, fuzzy, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "get_dir_record: search_record falhou: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, fuzzy, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "enumera��o de chaves secretas falhou: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "retirada de armadura falhou: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "cria��o de armadura falhou: %s\n"
 
 # "hash" poderia ser "espalhamento", mas n�o fica claro
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritmo de hash inv�lido `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nome_do_arquivo]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "V� em frente e digite sua mensagem ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 #, fuzzy
 msgid "the given certification policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 #, fuzzy
 msgid "the given signature policy URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "a URL de pol�tica dada � inv�lida\n"
@@ -2950,334 +2955,339 @@ msgstr "        novas assinaturas: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      chaves secretas lidas: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "assinatura %s de: %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "chave %08lX: sem ID de usu�rio\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "chave %08lX: aceito ID de usu�rio sem auto-assinatura '"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "chave %08lX: sem IDs de usu�rios v�lidos\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "isto pode ser causado por falta de auto-assinatura\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "chave %08lX: chave p�blica n�o encontrada: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "chave %08lX: n�o � uma chave rfc2440 - ignorada\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, fuzzy, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "imposs�vel escrever chaveiro: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "escrevendo para `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "chave %08lX: chave p�blica importada\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "chave %08lX: n�o corresponde � nossa c�pia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel localizar bloco de chaves original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "chave %08lX: imposs�vel ler bloco de chaves original: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "chave %8lX: 1 novo ID de usu�rio\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "chave %08lX: 1 nova assinatura\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "chave %08lX: 1 nova subchave\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "chave %08lX: %d novas subchaves\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "chave %08lX: %d novos IDs de usu�rios\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "chave %08lX: n�o modificada\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "chave %08lX: chave secreta sem chave p�blica - ignorada\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "escrevendo certificado privado para `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, fuzzy, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "imposs�vel bloquear chaveiro secreto: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "chave %08lX: chave secreta importada\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "chave %08lX: j� est� no chaveiro secreto\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "chave %08lX: chave secreta n�o encontrada: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "chave %08lX: sem chave p�blica - imposs�vel aplicar certificado\n"
 "de revoga��o\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - rejeitado\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "chave %08lX: certificado de revoga��o importado\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "chave %08lX: nenhum ID de usu�rio para assinatura\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "chave %08lX: algoritmo de chave p�blica n�o suportado\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "chave %08lX: %d novas assinaturas\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "chave %08lX: sem subchave para liga��o de chaves\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "chave %08lX.%lu: Revoga��o de subchave v�lida\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "chave %08lX: liga��o de subchave inv�lida\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "chave %08lX: ignorado ID de usu�rio '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "chave %08lX: subchave ignorada\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o inv�lido: %s - ignorada\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "chave %08lX: certificado de revoga��o no local errado - ignorada\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "chave %08lX: assinatura n�o export�vel (classe %02x) - ignorada\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "chave %08lX: detectado ID de usu�rio duplicado - unido\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "chave %08lX: certificado de revoga��o adicionado\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "chave %08lX: %d novas assinaturas\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "lid %lu n�o tem chave\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ignorado: a chave secreta j� est� presente\n"
@@ -3392,13 +3402,13 @@ msgid "User ID \"%s\" is revoked."
 msgstr "A chave � protegida.\n"
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 #, fuzzy
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr ""
 
@@ -3589,8 +3599,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Realmente assinar? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "assinatura falhou: %s\n"
@@ -3648,203 +3658,203 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Voc� realmente quer fazer isso? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "movendo a assinatura da chave para o local correto\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "gravar e sair"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "mostra impress�o digital"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "lista chave e identificadores de usu�rios"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "seleciona ID de usu�rio N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revoga assinaturas"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "assina a chave localmente"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "lid %lu: id de usu�rio sem assinatura\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 #, fuzzy
 msgid "add a photo ID"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "remove ID de usu�rio"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "remove uma chave secund�ria"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 #, fuzzy
 msgid "add a revocation key"
 msgstr "adiciona nova chave secund�ria"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr ""
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "alterna entre listagem de chave secreta e p�blica"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 #, fuzzy
 msgid "list preferences (expert)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 #, fuzzy
 msgid "list preferences (verbose)"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "muda a frase secreta"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "muda os valores de confian�a"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "adiciona um novo ID de usu�rio"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revoga uma chave secund�ria"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "ativa uma chave"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "desativa uma chave"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr ""
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "erro na leitura de `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Chave secreta dispon�vel.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "A chave secreta � necess�ria para fazer isto.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr ""
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3852,548 +3862,548 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 #, fuzzy
 msgid "Key is revoked."
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Realmente assinar todos os IDs de usu�rio? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugest�o: Selecione os IDs de usu�rio para assinar\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "classe de assinatura desconhecida"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr ""
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Voc� n�o pode remover o �ltimo ID de usu�rio!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "imposs�vel abrir `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "erro na escrita do chaveiro `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Voc� deve selecionar pelo menos uma chave.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Voc� realmente quer remover as chaves selecionadas? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Voc� realmente quer remover esta chave? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Realmente remover este ID de usu�rio? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Voc� realmente quer revogar as chaves selecionadas? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Voc� realmente quer revogar esta chave? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "lista prefer�ncias"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Realmente remover todos os IDs de usu�rio selecionados? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Salvar altera��es? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Sair sem salvar? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "atualiza��o falhou: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "atualiza��o da chave secreta falhou: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Chave n�o alterada, nenhuma atualiza��o � necess�ria.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr ""
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr ""
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "imposs�vel criar %s: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "revkey"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr "A chave expira em %s\n"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr "trust"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Esta chave foi desativada"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr ""
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "revkey"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 #, fuzzy
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Deletar esta assinatura v�lida? (s/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Deletar esta assinatura inv�lida? (s/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Deletar esta assinatura desconhecida? (s/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Realmente remover esta auto-assinatura? (s/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d assinatura removida.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d assinaturas removidas.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nada removido.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "armadura inv�lida"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 #, fuzzy
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Digite o tamanho da chave"
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "AVISO: Esta chave foi revogada pelo seu dono!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Por favor remova as sele��es das chaves secretas.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Por favor selecione no m�ximo uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Modificando a data de validade para uma chave secund�ria.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Modificando a data de validade para uma chave prim�ria.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Voc� n�o pode modificar a data de validade de uma chave v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nenhuma assinatura correspondente no chaveiro secreto\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 #, fuzzy
 msgid "Please select exactly one user ID.\n"
 msgstr "Voc� precisa selecionar pelo menos um ID de usu�rio.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "chave %08lX: auto-assinatura inv�lida\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Nota��o: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Sobrescrever (s/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nenhum ID de usu�rio com �ndice %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID de usu�rio: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr ""
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, fuzzy, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Esta chave n�o � protegida.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 #, fuzzy
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Voc� tem certeza de que quer este tamanho de chave? "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 #, fuzzy
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Gerar um certificado de revoga��o para esta assinatura? (s/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   assinado por %08lX em %s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Voc� assinou estes IDs de usu�rio:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr "assinar uma chave localmente"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revogado por %08lX em %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Voc� est� prestes a revogar estas assinaturas:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 #, fuzzy
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Realmente gerar os certificados de revoga��o? (s/N)"
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "nenhuma chave secreta\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, fuzzy, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "A chave � protegida.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5563,11 +5573,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "imposs�vel manipular algoritmo de chave p�blica %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpacote do tipo %d tem bit cr�tico ligado\n"
@@ -5962,29 +5972,29 @@ msgstr "chave %08lX: sem ID de usu�rio\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "dados n�o salvos; use a op��o \"--output\" para salv�-los\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Assinatura separada.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Por favor digite o nome do arquivo de dados: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "lendo de \"stdin\" ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 #, fuzzy
 msgid "no signed data\n"
 msgstr "no dados assinados\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imposs�vel abrir dados assinados `%s'\n"
diff --git a/po/ro.po b/po/ro.po
index 0cbd2ce33..20d9cb40f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.2rc1\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2005-05-31 22:00-0500\n"
 "Last-Translator: Laurentiu Buzdugan <[email protected]>\n"
 "Language-Team: Romanian <[email protected]>\n"
@@ -127,7 +127,7 @@ msgstr "nu pot crea `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -340,7 +340,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -351,107 +351,107 @@ msgstr ""
 "Op�iuni:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "locvace"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "fii oarecum mai t�cut"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|FI�IER|�ncarc� modulul extensie FI�IER"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "caut� pentru chei pe un server de chei"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "actualizeaz� baza de date de �ncredere"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "eroare la crearea frazei-parol�: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -459,158 +459,158 @@ msgstr ""
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Raporta�i bug-uri la <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Folosire: gpg [op�iuni] [fi�iere] (-h pentru ajutor)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "fi�ier op�iuni `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "citesc op�iuni din `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nu pot crea directorul `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "nu pot crea `%s': %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "eroare la ob�inere noului PIN: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "eroare trimitere la `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "scriu cheia secret� �n `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "director `%s' creat\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) a e�uat �n %s: %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "%s: nu pot crea director: %s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "eroare la citire `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: s�rit�: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nu este disponibil �n aceast� sesiune\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "variabila de mediu GPG_AGENT_INFO anormal�\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -821,7 +821,7 @@ msgstr "eroare la crearea frazei-parol�: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nu pot deschide fi�ierul: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -836,7 +836,7 @@ msgstr ""
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -846,7 +846,7 @@ msgstr "eroare la citire `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "eroare la citire `%s': %s\n"
@@ -959,11 +959,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1215,46 +1220,46 @@ msgstr "armur� nea�teptat�: "
 msgid "invalid dash escaped line: "
 msgstr "linie cu liniu�� escape invalid�: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "caracter radix64 invalid %02X s�rit\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "eof prematur (nici un CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "eof prematur (�n CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC anormal\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "eroare CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "eof prematur (�n trailer)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "eroare linia de trailer\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "nici o dat� OpenPGP valid� g�sit�.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "armur� invalid�: linie mai lung� de %d caractere\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1300,7 +1305,7 @@ msgstr "cardul OpenPGP nu e disponibil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "cardul OpenPGP nr. %s detectat\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1568,7 +1573,7 @@ msgstr "cheia secret� deja stocat� pe un card\n"
 msgid "error writing key to card: %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "ie�i din acest meniu"
 
@@ -1576,7 +1581,7 @@ msgstr "ie�i din acest meniu"
 msgid "show admin commands"
 msgstr "arat� comenzi administrare"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "afi�eaz� acest mesaj"
 
@@ -1648,7 +1653,7 @@ msgstr "Sunt permise comenzi administrare\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Nu sunt permise comenzi administrare\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 
@@ -1656,18 +1661,18 @@ msgstr "Comand� invalid�  (�ncerca�i \"ajutor\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output nu merge pentru aceast� comand�\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1953,7 +1958,7 @@ msgstr "Amprenta CA: "
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "Cheia invalid� %s f�cut� valid� de --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "nici o subcheie secret� pentru subcheia public� %s - ignorat�\n"
@@ -2194,7 +2199,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Pubkey: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Cifru: "
 
@@ -2202,7 +2207,7 @@ msgstr "Cifru: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Compresie: "
 
@@ -2360,406 +2365,406 @@ msgstr "NOT�: fisier op�iuni implicite vechi `%s' ignorat\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "NOT�: %s nu este pentru o folosire normal�!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' nu este un set de carectere valid\n"
 
 #
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "nu am putut interpreta URL-ul serverului de chei\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "op�iuni server de chei invalide\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: op�iuni import invalide\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "op�iuni import invalide\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: op�iuni export invalide\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "op�iuni export invalide\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "op�iuni enumerare invalide\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "`%s' nu este expirare de semn�tur� valid�\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nu pot seta cale-execu�ie ca %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: op�iuni verificare invalide\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "AVERTISMENT: programul ar putea crea un fi�ier core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "AVERTISMENT: %s �nlocuie�te %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s nu este permis cu %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s nu are sens cu %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "nu va rula cu memorie neprotejat� (insecure) pentru c� %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "pute�i crea doar semn�turi deta�ate sau �n clar c�t� vreme sunte�i �n modul "
 "--pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr ""
 "nu pute�i semna �i cifra �n acela�i timp c�t� vreme sunte�i �n modul --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr ""
 "trebuie s� folosi�i fi�iere (�i nu un pipe) c�nd lucra�i cu modul --pgp2 "
 "activat.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "cifrarea unui mesaj �n modul --pgp2 necesit� un cifru IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "algoritm cifrare selectat este invalid\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "algoritm rezumat selectat este invalid\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "algoritm compresie selectat este invalid\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "algoritm rezumat certificare selectat este invalid\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed trebuie s� fie mai mare dec�t 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed trebuie s� fie mai mare dec�t 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth trebuie s� fie �n intervalul de la 1 la 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "default-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "min-cert-level invalid; trebuie s� fie 0, 1, 2 sau 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "NOT�: modul S2K simplu (0) este contraindicat cu insisten��\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "mod S2K invalid; trebuie s� fie 0, 1 sau 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "preferin�e implicite invalide\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "preferin�e cifrare personale invalide\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "preferin�e rezumat personale invalide\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "preferin�e compresie personale invalide\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s nu merge �nc� cu %s!\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de cifrare `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algorimul de rezumat `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nu pute�i folosi algoritmul de compresie `%s' c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "am e�uat s� ini�ializez TrustDB:%s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "AVERTISMENT: destinatari (-r) furniza�i f�r� a folosi cifrare cu cheie "
 "public�\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [nume_fi�ier]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "cifrarea simetric� a lui `%s' a e�uat: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [nume_fi�ier]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt cu --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "nu pute�i folosi --symmetric --sign --encrypt c�t� vreme �n modul %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [nume_fi�ier]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [nume_fi�ier]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [nume_fi�ier]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id-utilizator"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id-utilizator [comenzi]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id-utilizator"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "trimitere server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "recep�ie server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export cheie e�uat: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "c�utare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "actualizare server de chei e�uat�: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "eliminarea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "punerea armurii a e�uat: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "algoritm hash invalid `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[nume_fi�ier]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Da�i-i drumul �i scrie�i mesajul ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "URL-ul politicii de certificare furnizat este invalid\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "URL-ul politicii de semn�turi furnizat este invalid\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "URL-ul serverului de chei preferat furnizat este invalid\n"
 
@@ -2914,337 +2919,342 @@ msgstr "semn�turi create p�n� acum: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     chei secrete citite: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "AVERTISMENT: cheia %s con�ine preferin�e pentru indisponibil\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm de cifrare %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm rezumat %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": preferin�� pentru algoritm compresie %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 "este puternic sugerat s� v� actualiza�i preferin�ele �i re-distribui�i\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "aceast� cheie pentru a avita probleme poten�iale de ne-potrivire de "
 "algoritm\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "v� pute�i actualiza preferin�ele cu: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "cheia %s: nici un ID utilizator\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "cheia %s: subcheia HPK corupt� a fost reparat�\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "cheia %s: am acceptat ID-ul utilizator ce nu e auto-semnat \"%s\"\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "cheia %s: nici un ID utilizator valid\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "aceasta poate fi cauzat� de o auto-semn�tur� ce lipse�te\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "cheia %s: cheia public� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "cheia %s: cheie nou� - s�rit�\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "n-am g�sit nici un inel de chei ce poate fi scris: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "scriu �n `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "eroare la scrierea inelului de chei `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "cheia %s: cheia public� \"%s\" importat�\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "cheia %s: nu se potrive�te cu copia noastr�\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "cheia %s: nu pot g�si keyblock-ul original: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "cheia %s: nu pot citi keyblock-ul original: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "cheia %s: \"%s\" 1 nou ID utilizator\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "cheia %s: \"%s\" 1 nou� semn�tur�\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "cheia %s: \"%s\" 1 nou� subcheie\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "cheia %s: \"%s\" %d noi subchei\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi semn�turi\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "cheia %s: \"%s\" %d noi ID-uri utilizator\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "cheia %s: \"%s\" nu a fost schimbat�\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "cheia %s: cheie secret� cu cifru invalid %d - s�rit�\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "importul de chei secrete nu este permis\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nici un inel de chei secrete implicit: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "cheia %s: cheie secret� importat�\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "cheia %s: deja �n inelul de chei secrete\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "cheia %s: cheia secret� nu a fost g�sit�: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "cheia %s: nici o cheie public� - nu pot aplica certificatul de revocare\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - respins\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "cheia %s: certificatul de revocare \"%s\" importat\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "cheia %s: nici un ID utilizator pentru semn�tur�\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "cheia %s: algoritm cu cheie public� nesuportat pentru ID-ul utilizator \"%s"
 "\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "cheia %s: auto-semn�tur� invalid� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "cheia %s: algoritm cu cheie public� nesuportat\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "cheia %s: nici o subcheie pentru legarea cheii\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "cheia %s: legare subcheie invalid�\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "cheia %s: am �ters multiple leg�turi de subchei\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "cheia %s: nici o subcheie pentru revocare de cheie\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "cheia %s: revocare de subcheie invalid�\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "cheia %s: am �ters multiple revoc�ri de subcheie\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "cheia %s: am s�rit ID-ul utilizator \"%s\"\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "cheia %s: am s�rit subcheia\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "cheia %s: semn�tura nu poate fi exportat� (clasa 0x%02X) - s�rit�\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "cheia %s: certificat de revocare �ntr-un loc gre�it - s�rit\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "cheia %s: certificat de revocare invalid: %s - s�rit\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "cheia %s: semn�tur� subcheie �ntr-un loc gre�it - s�rit�\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "cheia %s: clas� de semn�tur� nea�teptat� (0x%02X) - s�rit�\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "cheia %s: am detectat un ID utilizator duplicat - combinate\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "AVERTISMENT: cheia %s poate fi revocat�: aduc revocarea cheii %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "AVERTISMENT: cheia %s poate fi revocat�: cheia de revocare %s nu este "
 "prezent�.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "cheia %s: am ad�ugat certificatul de revocare \"%s\"\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "cheia %s: am ad�ugat semn�tura de cheie direct�\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "NOT�: S/N-ul unei chei nu se potrive�te cu cel al cardului\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "NOT�: cheia primar� este online �i stocat� pe card\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "NOT�: cheia secundar� este online �i stocat� pe card\n"
 
@@ -3355,12 +3365,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "ID utilizator \"%s\" a fost revocat."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� �terge�i permanent \"%s\"? (d/N)"
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Nu pot semna.\n"
 
@@ -3547,8 +3557,8 @@ msgstr "Am verificat aceast� cheie foarte atent.\n"
 msgid "Really sign? (y/N) "
 msgstr "Dori�i cu adev�rat s� semna�i? (d/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "semnarea a e�uat: %s\n"
@@ -3604,186 +3614,186 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� face�i acest lucru? (d/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "mut o semn�tur� de cheie �n locul corect\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "salveaz� �i termin�"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "afi�eaz� amprenta cheii"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "enumer� chei �i ID-uri utilizator"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "selecteaz� ID utilizator N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "selecteaz� subcheia N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "verific� semn�turi"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "semneaz� ID-urile utilizator selectate [* vezi mai jos pentru comenzi "
 "relevante]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i local"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� de �ncredere"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "semneaz� ID-urile utilizatorilor selecta�i cu o semn�tur� irevocabil�"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "adaug� un ID utilizator"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "adaug� o poz� ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "�terge ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "adaug� o subcheie"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "adaug� o cheie la un smartcard"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "mut� o cheie pe un smartcard"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "mut� o cheie de rezerv� pe un smartcard"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "�terge subcheile selectate"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "adaug� o cheie de revocare"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "�terge semn�turile de pe ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "schimb� data de expirare pentru cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "marcheaz� ID-ul utilizator selectat ca primar"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "comut� �ntre listele de chei secrete �i publice"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "enumer� preferin�ele (expert)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "afi�eaz� preferin�ele (detaliat)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seteaz� URL-ul serverului de chei preferat pentru ID-urile utilizator "
 "selectate"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "seteaz� lista de preferin�e pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "schimb� fraza-parol�"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "schimb� �ncrederea pentru proprietar"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "revoc� semn�turile pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "revoc� ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "revoc� cheia sau subcheile selectate"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "activeaz� cheia"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "deactiveaz� cheia"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "arat� pozele pentru ID-urile utilizator selectate"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "eroare la citire keyblock secret \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Cheia secret� este disponibil�.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Ave�i nevoie de cheia secret� pentru a face aceasta.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "V� rug�m folosi�i mai �nt�i comanda \"toggle\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3795,229 +3805,229 @@ msgstr ""
 "  pentru semn�turi irevocabile (nrsign), sau orice combina�ie a acestora\n"
 "  (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Cheia este revocat�."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Semna�i �ntr-adev�r toate ID-urile utilizator? (d/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Sugestie: Selecta�i ID-ul utilizator de semnat\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Tip de semn�tur� necunoscut `%s'\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Aceast� comand� nu este permis� �n modul %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Trebuie mai �nt�i s� selecta�i cel pu�in un ID utilizator.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Nu pute�i �terge ultimul ID utilizator!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "�terge�i �ntr-adev�r toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "�terge�i �ntr-adev�r acest ID utilizator? (d/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Muta�i �ntr-adev�r cheia primar�? (d/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Trebuie s� selecta�i exact o cheie.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Comanda a�teapt� un nume de fi�ier ca argument\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Nu pot deschide `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Eroare citind cheia de rezerv� de pe `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Trebuie s� selecta�i cel pu�in o cheie.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i cheile selectate? (d/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� �terge�i aceast� cheie? (d/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� revoca�i toate ID-urile utilizator selectate? (d/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i acest ID utilizator? (d/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i toat� cheia? (d/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i subcheile selectate? (d/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� revoca�i aceast� subcheie? (d/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "�ncrederea proprietar nu poate fi setat� c�nd este folosit� o baz� de date "
 "de �ncredere furnizat� de utilizator\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Seteaz� lista de preferin�e ca:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Dori�i �ntr-adev�r s� actualiza�i preferin�ele pentru ID-urile utilizator "
 "selectate? (d/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� actualiza�i preferin�ele? (d/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Salva�i schimb�rile?  (d/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Termina�i f�r� a salva?  (d/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "actualizarea a e�uat: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "actualizarea secretului a e�uat: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Cheia nu a fost schimbat� a�a c� nici o actualizare a fost necesar�.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Rezumat: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Capabilit��i: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Server de chei no-modify"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Server de chei preferat: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Nota�ie:"
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Nu exist� nici o preferin�� pentru un ID utilizator stil PGP 2.x.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Aceast� cheie a fost revocat� pe %s de %s cheia %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Aceast� cheie poate fi revocat� de %s cheia %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr " (senzitiv)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "creat�: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "revocat�: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "expirat�: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "expir�: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "folosire: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "�ncredere: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "validitate: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Aceast� cheie a fost deactivat�"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "nr-card: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4026,17 +4036,17 @@ msgstr ""
 "corect� dac� nu reporni�i programul.\n"
 
 #
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "revocat�"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "expirat�"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4045,7 +4055,7 @@ msgstr ""
 "              Aceast� comand� poate cauza ca un alt ID utilizator\n"
 "              s� devin� ID-ul utilizator primar presupus.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4054,74 +4064,74 @@ msgstr ""
 "AVERTISMENT: Aceasta este o cheie stil PGP2.  Ad�ugarea unei poze ID poate\n"
 "         cauza unele versiuni de PGP s� resping� aceast� cheie.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o ad�uga�i? (d/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nu pute�i ad�uga o poz� ID la o cheie stil PGP2.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� bun�? (d/N/t)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� invalid�? (d/N/t)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "�terge�i aceast� semn�tur� necunoscut�? (d/N/t)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "�terge�i �ntr-adev�r aceast� auto-semn�tur�? (d/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Am �ters %d semn�turi.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Nu am �ters nimic.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "invalid(�)"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "ID utilizator \"%s\" a fost revocat."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "ID-ul utilizator \"%s\": este deja curat.\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4131,200 +4141,200 @@ msgstr ""
 "             desemnat poate face ca unele versiuni de PGP s� resping� "
 "cheia.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nu pute�i ad�uga un revocator desemnat la o cheie stil PGP 2.x.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Introduce�i ID-ul utilizator al revocatorului desemnat: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "nu pot desemna o cheie stil PGP 2.x ca un revocator desemnat\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "nu pute�i desemna o cheie ca propriul s�u revocator desemnat\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "aceast� cheie a fost deja desemnat� ca un revocator\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "AVERTISMENT: desemnarea unei chei ca un revocator desemnat nu poate fi "
 "anulat�!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Sunte�i sigur(�) c� dori�i s� desemna�i aceast� cheie ca �i un revocator "
 "desemnat? (d/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "V� rug�m �terge�i selec�iile din cheile secrete.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "V� rug�m selecta�i cel mult o subcheie.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Schimb timpul de expirare pentru o subcheie.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Schimb timpul de expirare pentru cheia primar�.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nu pute�i schimba data de expirare a unei chei v3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Nici o semn�tur� corespunz�toare �n inelul secret\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr ""
 "AVERTISMENT: subcheia de semnare %s nu este certificat� reciproc (cross-"
 "certified)\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "V� rug�m selecta�i exact un ID utilizator.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "auto-semn�tur� v3 s�rit� pentru ID-ul utilizator \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Introduce�i URL-ul serverului de chei preferat: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Sunte�i sigur(�) c� dori�i s� o folosi�i? (d/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Notare semn�tur�: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Suprascriu? (d/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Nici un ID utilizator cu indicele %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Nici un ID utilizator cu hash-ul %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Nici o subcheie cu indicele %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "ID utilizator: \"%s\"\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "semnat� de cheia d-voastr� %s la %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (non-exportabil�)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Aceast� semn�tur� a expirat pe %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Sunte�i �nc� sigur(�) c� dori�i s� o revoca�i? (d/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Crea�i un certificat de revocare pentru aceast� semn�tur�? (d/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "A�i semnat aceste ID-uri utilizator pe cheia %s:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (non-revocabil�)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "revocat� de cheia d-voastr� %s pe %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Sunte�i pe cale s� revoca�i aceste semn�turi:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Dori�i �ntr-adev�r s� crea�i certificatele de revocare? (d/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "nici o cheie secret�\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "ID-ul utilizator \"%s\" este deja revocat\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "AVERTISMENT: o semn�tur� ID utilizator este datat� %d secunde �n viitor\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Cheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Subcheia %s este deja revocat�.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Afi�ez poza ID %s de dimensiune %ld pentru cheia %s (uid %d)\n"
@@ -5463,13 +5473,13 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "nu pot m�nui algoritmul cu cheie public� %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "AVERTISMENT: cheie de sesiune cifrat� simetric poten�ial nesigur� "
 "(insecure)\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "subpachetul de tip %d are bitul critic setat\n"
@@ -5858,28 +5868,28 @@ msgid "data not saved; use option \"--output\" to save it\n"
 msgstr ""
 "datele nu au fost salvate: folosi�i op�iunea \"--output\" pentru a le salva\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Semn�tur� deta�at�.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "V� rug�m introduce�i numele fi�ierului de date: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "citesc stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "nici o dat� semnat�\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nu pot deschide date semnate `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nu pot deschide date semnate `%s'\n"
diff --git a/po/ru.po b/po/ru.po
index 26bd8237f..e36230178 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: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2008-12-21 00:40+0200\n"
 "Last-Translator: Maxim Britov <[email protected]>\n"
 "Language-Team: Russian <[email protected]>\n"
@@ -119,7 +119,7 @@ msgstr "не могу создать `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -335,7 +335,7 @@ msgstr "Введите фразу-пароль%0Aдля защиты новог�
 msgid "Please enter the new passphrase"
 msgstr "Введите новую фразу-пароль"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -344,113 +344,113 @@ msgstr ""
 "@Параметры:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "запуск в режиме сервера (foreground)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "запуск в режиме демона (background)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "подробно"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "уменьшить количество выводимой информации"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "вывод результатов в sh-стиле"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "вывод результатов в csh-стиле"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|взять параметры из FILE"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "не отсоединяться от консоли"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "не перехватывать события мыши и клавиатуры"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "использовать файл журнала для сервера"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "стандартное расположение сокета"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|использовать PGM как PIN-Entry"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM| использовать PGM как SCdaemon"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "не использовать SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "игнорировать запросы смены TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "игнорировать запросы смены X дисплея"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|кеш PIN просрочен после N секунд"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "не использовать кеш PIN при подписывании"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "позволить клиентам помечать ключи как \"доверяемые\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "разрешить предустановленную фразу-пароль"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "разрешить эмуляцию ssh-агента"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FILE|сохранить состояние окружения и в файл"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "О найденных ошибка сообщайте <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Использование: gpg-agent [параметры] (-h для подсказки)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -458,144 +458,144 @@ msgstr ""
 "Синтаксис: gpg-agent [параметры] [команда [аргументы]]\n"
 "Управление закрытыми ключами для GnuPG\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "запрошен недупустимый уровень отладки `%s'\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "ЗАМЕЧАНИЕ: файл конфигурации `%s' не обнаружен\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "файл конфигурации `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "параметры конфигурации из файла `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "не могу создать каталог `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "имя сокета слишком длинное\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "не могу создать сокет: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "имя сокета `%s' слишком длинное\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent уже запущен - еще один, новый, запущен не будет\n"
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "ошибка связывния сокета с `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "слушаем сокет `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "создан каталог `%s'\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "невозможно использовать `%s' как домашний каталог\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr ""
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s: остановлен\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr "нет gpg-agent доступого для данной сессии\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "неправильная переменная окружения GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -808,7 +808,7 @@ msgstr ""
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr ""
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr ""
@@ -823,7 +823,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "ошибка получения кода возврата процесса %d: %s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "ошибка чтения `%s': статус завершения %d\n"
@@ -833,7 +833,7 @@ msgstr "ошибка чтения `%s': статус завершения %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "ошибка запуска `%s': позможно не установлен\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "ошибка чтения `%s': прервано\n"
@@ -942,11 +942,16 @@ msgstr "выход за безопасный предел памяти при р
 msgid "out of core while allocating %lu bytes"
 msgstr "выход за границы при распределении %lu байтов"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "нет работающих gpg-agent - запускаем\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "невозможно подключиться к агенту - пробуем откатиться назад\n"
 
@@ -1178,46 +1183,46 @@ msgstr "неожидаемый формат ASCII:"
 msgid "invalid dash escaped line: "
 msgstr "неправильный отступ из минусов: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "недопустимый символ radix64 %02X пропущен\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "преждевременный конец файла (нет CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "преждевременный конец файла (в CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "поврежденный CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "ошибка CRC; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "преждевременный конец файла (в дополнении)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "ошибка в строке дополнения\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "не найдено данных формата OpenPGP.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "неправильный ASCII формат: строка длиннее %d символов\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1262,7 +1267,7 @@ msgstr "Карта OpenPGP недоступна: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "Обнаружена карта OpenPGP номер %s \n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "невозможно сделать это в пакетном режиме\n"
@@ -1528,7 +1533,7 @@ msgstr "секретный ключ уже сохранен в карте\n"
 msgid "error writing key to card: %s\n"
 msgstr "сбой записи ключа: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "выйти из этого меню"
 
@@ -1536,7 +1541,7 @@ msgstr "выйти из этого меню"
 msgid "show admin commands"
 msgstr "показать управляющие команды"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "показать данную справку"
 
@@ -1608,7 +1613,7 @@ msgstr "Команды администрирования разрешены\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Команды администрирования не разрешены\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Недопустимая команда  (список команд: \"help\")\n"
 
@@ -1616,18 +1621,18 @@ msgstr "Недопустимая команда  (список команд: \"h
 msgid "--output doesn't work for this command\n"
 msgstr "--output не работает для данной команды\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1903,7 +1908,7 @@ msgstr ""
 "Дефектный ключ %s признан пригодным согласно параметра --allow-non-"
 "selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "нет секретного подключа для открытого подключа %s - игнорируем\n"
@@ -2136,7 +2141,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "  с открытым ключом: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "  симметричные шифры: "
 
@@ -2144,7 +2149,7 @@ msgstr "  симметричные шифры: "
 msgid "Hash: "
 msgstr "  хэш-функции: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "  алгоритмы сжатия: "
 
@@ -2292,398 +2297,398 @@ msgstr "ЗАМЕЧАНИЕ: старый файл конфигурации по
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libcrypt слишком старой версии (требуется %s, обнаружено %s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "ЗАМЕЧАНИЕ: %s не предназначен для обычного применения!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' недопустимый срок действия подписи\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' недопустимая таблица символов\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "не могу проанализировать URL сервера ключей\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "недопустимые параметры для сервера ключей\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "недопустимые параметры импорта\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "недопустимые параметры экспорта\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: недопустимый список параметров\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "недопустимый список параметров\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "отображать Фото ID при проверке подписи"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "печатать ссылку на политики при проверке подписи"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "печатать все примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "печатать стандартные IETF примечания в процессе проверки подписей"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "печатать добавленные пользователем примечания при проверке подписей"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "печатать предпочитаемые серверы ключей при проверке подписей"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "печатать действительность UserID при проверке подписей"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "печатать отозванные и просроченные User ID при проверке подписей"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "печатать только главный User ID при проверке подписей"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: недопустимые параметры проверки \n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "недопустимые параметры проверки\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "не могу определить путь запуска для %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "недопустимый список auto-key-locate\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "ВНИМАНИЕ: возможно создание файла дампа памяти программы!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "ВНИМАНИЕ: %s заместит %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s не допускается использовать с %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s не имеет смысла совместно с %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "не будет работать с небезопасной памятью из-за %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "можно сделать только отделенную или прозрачную подпись в режиме --pgp2\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "Нельзя одновременно подписать и зашифровать в режиме --pgp2\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "Следует использовать файлы (а не каналы (pipe)) в режиме --pgp2.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "для зашифрования сообщения в режиме --pgp2 требуется шифр IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "выбран неверный алгоритм шифрования\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "выбран неверный алгоритм сжатия\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "выбрана неверная хэш-функция для сертификации\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed должен быть больше 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed должен быть больше 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth должен быть в диапазоне от 1 до 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "недопустимый default-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "недопустимый min-cert-level; должен быть 0, 1, 2 или 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "ЗАМЕЧАНИЕ: простой режим S2K (0) строго не рекомендуется\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "недопустимый режим S2K; должно быть 0, 1 или 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "недопустимые предпочтения по умолчанию\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "недопустимые персональные предпочтения шифра\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "недопустимые персональные предпочтения хэш-функции\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "недопустимые персональные предпочтения алгоритмов сжатия\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s пока не работает совместно с %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать шифрование `%s' в режиме %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать хэш-функцию `%s' в режиме %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "нельзя использовать сжатие `%s' в режиме %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "сбой инициализации таблицы доверий: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "ВНИМАНИЕ: получатели (-r) заданы без использования шифрования с открытым "
 "ключом\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [файл]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [файл]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "симметричное шифрование `%s' не удалось: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [файл]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [файл]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "нельзя использовать --symmetric --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [файл]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [файл]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [файл]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 "нельзя использовать --symmetric --sign --encrypt совместно с --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "невозможно использовать --symmetric --sign --encrypt в режиме %s\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [файл]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [файл]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [файл]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key user-id"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key user-id [команды]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key user-id"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "сбой при отправке на сервер ключей: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "сбой при получении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "сбой при экспорте ключа: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "сбой при поиске на сервере ключей: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "сбой при обновлении с сервера ключей: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "ошибка преобразования из ASCII формата: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "ошибка преобразования в ASCII формат: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "недопустимая хэш-функция `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[имяфайла]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Набирайте Ваше сообщение ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "заданный URL политики сертификации неверен\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "заданный URL политики подписи неверен\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "заданный URL предпочитаемого сервера ключей неправилен\n"
 
@@ -2835,7 +2840,7 @@ msgstr "    подписей очищено: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      очищено User ID: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2844,327 +2849,332 @@ msgstr ""
 "ВНИМАНИЕ: ключ %s содержит предпочтения для недоступных\n"
 "алгоритмов для данных User IDs:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": предпочитает шифр %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": предпочитает хеш-функцию %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": предпочитает сжатие %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "крайне желательно, чтобы Вы обновили Ваши предпочтения и\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "распространите данный ключ, чтобы избежать потенциальных проблем "
 "несовпадения алгоритмов\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "можете обновить список предпочтений используя: gpg --edit-key %s updpref "
 "save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "ключ %s: не имеет User ID\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "ключ %s: PKS повреждение подключа исправлено\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "ключ %s: принят несамоподписанный User ID \"%s\"\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "ключ %s: нет действительных User ID\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "причиной этого может быть отсутствие самоподписи\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "ключ %s: не найден открытый ключ: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "ключ %s: новый ключ - пропущен\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "нет доступной для записи таблицы ключей: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "сохраняю в `%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "ошибка записи таблицы ключей `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "ключ %s: открытый ключ \"%s\" импортирован\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "ключ %s: не совпадает с копией хранимой у нас\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "ключ %s: не нахожу оригинальный блок ключей: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "ключ %s: не могу прочитать оригинальный блок ключей: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "ключ %s: \"%s\" 1 новый User ID\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "ключ %s: \"%s\" %d новых User ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "ключ %s: \"%s\" 1 новая подпись\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "ключ %s: \"%s\" %d новых подписей\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "ключ %s: \"%s\" 1 новый подключ\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "ключ %s: \"%s\" %d новых подключей\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "ключ %s: \"%s\" %d подпись очищена\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "ключ %s: \"%s\" %d очищеных подписей\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "ключ %s: \"%s\" %d User ID очищен\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "ключ %s: \"%s\" %d  очищенных User ID\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "ключ %s: \"%s\" не изменен\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "ключ %s: секретный ключ с недопустимым шифром %d - пропущен\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "импортирование секретного ключа не позволено\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "нет основной таблицы секретных ключей: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "ключ %s: секретный ключ импортирован\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "ключ %s: уже есть в таблице секретных ключей\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "ключ %s: не найден секретный ключ: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "ключ %s: нет открытого ключа - не могу применить сертификат отзыва\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - отвергнут\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "ключ %s: \"%s\" сертификат отзыва импортирован\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "ключ %s: нет User ID для подписи\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "ключ %s: неподдерживаемый алгоритм с открытым ключом у User ID \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "ключ %s: неправильная самоподпись на User ID \"%s\"\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "ключ %s: нет подключа для связывания подключей\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "ключ %s: неподдерживаемый алгоритм с открытым ключом\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "ключ %s: direct key signature добавлена\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "ключ %s: нет подключа для связывания подключей\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "ключ %s: неправильная связь подключей\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "ключ %s: удалено многократное связывание подключей\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "ключ %s: нет подключа для отзывающего ключа\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "ключ %s: неправильный отзыв подключа\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "ключ %s: удалена многожественность подключей отзыва\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "ключ %s: пропущен User ID \"%s\"\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "ключ %s: пропущен подключ\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "ключ %s: не экспортируемая подпись (класс 0x%02X) - пропущена\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "ключ %s: сертификат отзыва в неправильном месте - пропущен\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "ключ %s: неправильный сертификат отзыва: %s - пропущен\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "ключ %s: подпись подключа в неправильном месте - пропущена\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "ключ %s: неизвестный класс подписи (0x%02X) - пропущена\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "ключ %s: обнаружено дублирование User ID - объединены\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: запрашиваю ключ отзыва %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "ВНИМАНИЕ: ключ %s возможно отозван: ключ отзыва %s не получен.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "ключ %s: \"%s\" добавлен сертификат отзыва\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "ключ %s: direct key signature добавлена\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "ПРЕДУПРЕЖДАЮ: S/N ключа не соответствует S/N ключа на карте\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: главный ключ готов и сохранен в карте\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "ПРЕДУПРЕЖДАЮ: вторичный ключ готов и сохранен в карте\n"
 
@@ -3276,12 +3286,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "User ID \"%s\" отозван."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Вы уверены, что хотите подписать? (y/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Не могу подписать.\n"
 
@@ -3464,8 +3474,8 @@ msgstr "Я очень тщательно проверил этот ключ.\n"
 msgid "Really sign? (y/N) "
 msgstr "Действительно подписать? (y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "не удалось подписать: %s\n"
@@ -3519,180 +3529,180 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Действительно хотите сделать это? (y/N)"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "перемещение подписи ключа в правильное место\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "сохранить и выйти"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "показать отпечаток ключа"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "вывести список ключей и User ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "выбрать User ID N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "выбрать подключ N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "проверка подписей"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "подписать выбранные User ID [* описание соотв. команд см. ниже]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "локально подписать выбранные User ID"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "подписать выбранные User ID - trust подписью"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "подписать выбранные User ID без возможности отзыва"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "добавить User ID"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "добавить фото ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "удалить выбранные User ID"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "добавить подключ"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "добавить ключ на карту"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "переместить ключ на карту"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "переместить резервную копию на смарткарту"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "удалить выбранные подключи"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "добавить ключ отзыва"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "удалить подписи у выбранных User ID"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "сменить срок действительности ключа или выбранных подключей"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "пометить выбранный User ID как главный"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "переключение между просмотром открытых и закрытых ключей"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "список предпочтений (экспертам)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "список предпочтений (подробный)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "установить список предпочтений для выбранных User ID"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "установить URL предпочитаемого сервера ключей для выбранных User ID"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "установить примечание для выбранных User ID"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "сменить фразу-пароль"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "изменить уровень доверия владельцу"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "отозвать подписи у выбранных User ID"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "отзыв выбранных User ID"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "отзыв ключа или выбранных подключей"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "включить ключ"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "отключить ключ"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "показать выбранные фото ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "сжать неиспользуемые User ID и удалить неиспользуемые подписи с ключа"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "сжать неиспользуемые User ID и удалить все подписи с ключа"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "ошибка чтения секретного блока ключа \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Секретный ключ доступен.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Для данного действия нужен секретный ключ.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Сначала воспользуйтесь командой \"toggle\".\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3704,225 +3714,225 @@ msgstr ""
 "  `t' - trust подпись (tsign), `nr' - без возможности отзыва\n"
 "  (nrsign) или любым их сочетанием (ltsign, tnrsign и т.д.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Ключ отозван."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Действительно хотите подписать ВСЕ User ID? (y/N)"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Совет: Выберите User ID для подписания\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Неизвестный тип подписи `%s'\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Данная команда не допустима в режиме %s.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Следует выбрать хотя бы один User ID.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Нельзя удалить последний User ID!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Действительно хотите удалить ВСЕ выбранные User IDs? (y/N)"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Действительно хотите удалить данный User ID? (y/N)"
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Действительно удалить главный ключ? (y/N)"
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Следует выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Команда ожидает аргумент: имя файла\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Не могу открыть `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Ошибка чтения резервного ключа с `%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Следует выбрать хотя бы один ключ.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Действительно хотите удалить выбранные ключи? (y/N)"
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Действительно хотите удалить данный ключ? (y/N)"
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Действительно отозвать ВСЕ выбранные User ID? (y/N)"
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Действительно отозвать данный User ID? (y/N)"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Действительно хотите отозвать ключ целиком? (y/N)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Действительно хотите отозвать выбранные подключи? (y/N)"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Действительно хотите отозвать данный подключ? (y/N)"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Доверие владельцу не может быть настроено с предоставленной пользователем "
 "таблицы доверий\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Установить предпочтения в:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Действительно обновить предпочтения для выбранных User ID? (y/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Действительно обновить предпочтения? (y/N)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Сохранить изменения? (y/N)"
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Выйти без сохранения? (y/N)"
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "сбой при обновлении: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "сбой при обновлений секретного ключа: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Ключ не изменялся - обновление не нужно.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Хэш-функции: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Опции: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Предпочитаемый сервер ключей: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Примечания: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Не может быть предпочтений в PGP 2.x-стиле User ID.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Данный ключ был отозван %s - %s ключом %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Данный ключ может быть отозван %s ключом %s "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr ""
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "создан: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "отозван: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "просрочен с: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "годен до: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "применяемость: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "доверие: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "достоверность: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Данный ключ отключен"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3930,17 +3940,17 @@ msgstr ""
 "Учтите, что показанные степени достоверности могут быть неверными,\n"
 "пока программа не будет перезапущена.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "отозван"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "просрочен с"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3948,7 +3958,7 @@ msgstr ""
 "ВНИМАНИЕ: нет User ID помеченного как главный. Данная команда может\n"
 "              воспользоваться другим user ID, используя его как главный.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3957,74 +3967,74 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP2.  Добавление фото ID может в некоторых версиях\n"
 "         PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Вы уверены, что хотите добавить это? (y/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Нельзя добавлять фото ID в ключ PGP2-типа.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Удалить данную действительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Удалить данную недействительную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Удалить данную неизвестную подпись? (y/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Действительно удалить данную самоподпись? (y/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Удалена %d подпись.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Удалено %d подписи.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Ничего не удалено.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "недопустимый"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "User ID \"%s\": сжат: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "User ID \"%s\": %d подпись удалена\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "User ID \"%s\": %d удалено подписей\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "User ID \"%s\": уже минимизирован\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "User ID \"%s\": уже очищен\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4033,191 +4043,191 @@ msgstr ""
 "ВНИМАНИЕ: Это ключ PGP 2.x. Добавление назначенного отзывающим ключа\n"
 "          может в некоторых версиях PGP вызвать выбраковку ключа.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Нельзя добавлять назначенный отзывающим ключ в PGP 2.x ключ.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Укажите User ID ключа, назначенного отзывающим: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "нельзя назначить ключ PGP 2.x отзывающим\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "ключ не может быть назначен отзывающим сам себя\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "этот ключ уже назначен отзывающим\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "ВНИМАНИЕ: назначение ключа отзывающим невозможно будет отменить!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Вы уверены, что хотите назначить данный ключ отзывающим? (y/N)"
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Снимите выделение с секретного ключа.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Выделите не менее одного подключа.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Смена срока действительности подключа.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Смена срока действия главного ключа\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Нельзя изменять срок действия v3 ключа\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Нет соответствующей подписи в связке секретных\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "подписываемый подключ %s уже имеет перекрестную сертификацию\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "подключ %s не подписывающий и не нуждается в перекрестной подписи\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Выберите только один User ID.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "пропуск v3 самоподписи на User ID \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Введите URL предпочтаемого сервера ключей: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Действительно хотите заменить его? (y/N)"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Действительно хотите удалить его? (y/N)"
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Введите примечание:"
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "Обработать? (y/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Нет User ID с индексом %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Нет User ID с хешем %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Нет подключа с индексом %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "User ID: \"%s\"\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "подписано Вашим ключом %s от %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (не экспортируемая)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Срок действительности подписи закончился %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Вы уверены, что хотите отозвать? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Создать сертификат отзыва для данной подписи? (y/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Вы подписали данные User ID на ключе %s:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (не отзываемая)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "отзыв Вашим ключом %s от %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Вы отзываете следующие подписи:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Действительно создать сертификат отзыва? (y/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "нет секретного ключа\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "User ID \"%s\" уже отозван\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "ВНИМАНИЕ: User ID подпись датирована %d секундами в будущем\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Ключ %s уже отозван\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Подключ %s уже отозван\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Показ %s фото ID размера %ld для ключа %s (uid %d)\n"
@@ -5353,13 +5363,13 @@ msgstr "ВНИМАНИЕ: параметры в `%s' еще не активны
 msgid "can't handle public key algorithm %d\n"
 msgstr "не могу использовать алгоритм с открытым ключом %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "ВНИМАНИЕ: потенциально небезопасный сеансовый ключ, зашифрованный "
 "симметричным шифром\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "подпакет типа %d имеет выставленный критический бит\n"
@@ -5740,28 +5750,28 @@ msgstr "Замечание: ключ %s не имеет предпочтения
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "данные не сохранены; используйте \"--output\" для сохранения\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Отделенная подпись.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Введите имя файла с данными: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "читаю stdin ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "не подписанные данные\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "не могу открыть подписанные данные `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "не могу открыть подписанные данные fd=%d: %s\n"
diff --git a/po/sk.po b/po/sk.po
index 249a5a240..e64e419cf 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.2.5\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2004-07-20 15:52+0200\n"
 "Last-Translator: Michal Majer <[email protected]>\n"
 "Language-Team: Slovak <[email protected]>\n"
@@ -120,7 +120,7 @@ msgstr "nem��em vytvori� `%s': %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -326,7 +326,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "zmeni� heslo"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -337,107 +337,107 @@ msgstr ""
 "Mo�nosti:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "s dodato�n�mi inform�ciami"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "by� o trochu tich��"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "|S�BOR|nahra� roz�iruj�ci modul S�BOR"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "vyh�ada� k���e na serveri k���ov"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "aktualizova� datab�zu d�very"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -447,158 +447,158 @@ msgstr ""
 "Chyby ozn�mte, pros�m, na adresu <[email protected]>.\n"
 "Pripomienky k prekladu <[email protected]>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Pou�itie: gpg [mo�nosti] [s�bory] (-h pre pomoc)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "s�bor s mo�nos�ami `%s': %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "��tam mo�nosti z `%s'\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "nem��em vytvori� adres�r `%s': %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "chyba pri vytv�ran� hesla: %s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "chyba pri posielan� na `%s': %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, fuzzy, c-format
 msgid "directory `%s' created\n"
 msgstr "%s: adres�r vytvoren�\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, 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:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, 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:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s: presko�en�: %s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent nie je v tomto seden� dostupn�\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "zl� form�t premennej prostredia GPG_AGENT_INFO\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -806,7 +806,7 @@ msgstr "chyba pri vytv�ran� hesla: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "nemo�no otvori� s�bor: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -821,7 +821,7 @@ msgstr ""
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -831,7 +831,7 @@ msgstr "chyba pri ��tan� `%s': %s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "chyba pri ��tan� `%s': %s\n"
@@ -945,11 +945,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1201,47 +1206,47 @@ msgstr "neo�ak�van� k�dovanie ASCII:"
 msgid "invalid dash escaped line: "
 msgstr "nespr�vne ozna�enie riadku m�nusmi: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, fuzzy, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "neplatn� znak vo form�te radix64 %02x bol presko�en�\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "pred�asn� koniec s�boru (�iadne CRC)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "pred�asn� koniec s�boru (v CRC)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "nespr�vny form�t CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, fuzzy, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "Chyba CRC; %06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 #, fuzzy
 msgid "premature eof (in trailer)\n"
 msgstr "pred�asn� koniec s�boru (v p�ti�ke)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "chyba v p�ti�ke\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "nen�jden� �iadne platn� d�ta vo form�te OpenPGP.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "neplatn� k�dovanie ASCII: riadok je dlh�� ako %d znakov\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1287,7 +1292,7 @@ msgstr "tajn� k��� nie je dostupn�"
 msgid "OpenPGP card no. %s detected\n"
 msgstr ""
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 #, fuzzy
 msgid "can't do this in batch mode\n"
@@ -1572,7 +1577,7 @@ msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 msgid "error writing key to card: %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "ukon�i� toto menu"
 
@@ -1581,7 +1586,7 @@ msgstr "ukon�i� toto menu"
 msgid "show admin commands"
 msgstr "konfliktn� pr�kazy\n"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "uk�za� t�to pomoc"
 
@@ -1661,7 +1666,7 @@ msgstr "konfliktn� pr�kazy\n"
 msgid "Admin commands are not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 
@@ -1669,18 +1674,18 @@ msgstr "Neplatn� pr�kaz (sk�ste \"help\")\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output pre tento pr�kaz nefunguje\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1971,7 +1976,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Neplatn� k��� %08lX zmenen� na platn� pomocou --always-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, fuzzy, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "existuje tajn� k��� pre tento verejn� k��� %08lX!\n"
@@ -2218,7 +2223,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Verejn� k���e: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "�ifry: "
 
@@ -2226,7 +2231,7 @@ msgstr "�ifry: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Kompresia: "
 
@@ -2371,413 +2376,413 @@ msgstr "POZN�MKA: star� implicitn� s�bor s mo�nos�ami `%s ignorovan�'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "POZN�MKA: %s nie je pre norm�lne pou�itie!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, fuzzy, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, fuzzy, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 #, fuzzy
 msgid "could not parse keyserver URL\n"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, fuzzy, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 #, fuzzy
 msgid "invalid keyserver options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, fuzzy, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 #, fuzzy
 msgid "invalid list options\n"
 msgstr "neplatn� parameter pre import\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 #, fuzzy
 msgid "show all notations during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr ""
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 #, fuzzy
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 #, fuzzy
 msgid "show user ID validity during signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "%s nie je platn� znakov� sada\n"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr ""
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr ""
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, fuzzy, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 #, fuzzy
 msgid "invalid verify options\n"
 msgstr "neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "nemo�no nastavi� exec-path na %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, fuzzy, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: neplatn� parameter pre export\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr ""
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VAROVANIE: program m��e vytvori� s�bor core!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VAROVANIE: %s prep��e %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "Nie je dovolen� pou��va� %s s %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s ned�va s %s zmysel!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, fuzzy, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "v m�de --pgp2 m��ete vytv�ra� len oddelen� podpisy alebo podpisy �itate�n� "
 "ako text\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "v m�de --pgp2 nemo�no s��asne �ifrova� a podpisova�\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "v m�de --pgp2 mus�te pou�i� s�bor (nie r�ru).\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "�ifrovanie spr�v v m�de --pgp2 vy�aduje algoritmus IDEA\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 #, fuzzy
 msgid "selected compression algorithm is invalid\n"
 msgstr "vybran� �ifrovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vybran� hashovac� algoritmus je neplatn�\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "polo�ka completes-needed mus� by� v��ia ako 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "polo�ka marginals-needed mus� by� v��ia ako 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 #, fuzzy
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "polo�ka max-cert-depth mus� by� v rozmedz� od 1 do 255\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "neplatn� implicitn� �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "neplatn� minim�lna �rove� certifik�cie; mus� by� 0, 1, 2 alebo 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "POZN�MKA: jednoduch� m�d S2K (0) je d�razne nedoporu�ovan�\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "neplatn� m�d S2K; mus� by� 0, 1 alebo 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "neplatn� defaultn� predvo�by\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre �ifrovanie\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre hashovanie\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "neplatn� u��vate�sk� predvo�by pre kompresiu\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s e�te nepracuje s %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, fuzzy, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� �ifrovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, fuzzy, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� hashovac� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, fuzzy, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "nem��ete pou�i� kompresn� algoritmus \"%s\" v m�de %s\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "nem��em inicializova� datab�zu d�very: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VAROVANIE: dan� adres�t (-r) bez pou�itia �ifrovania s verejn�m k���om\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [meno s�boru]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [meno s�boru]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, fuzzy, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "de�ifrovanie zlyhalo: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [meno s�boru]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 #, fuzzy
 msgid "--symmetric --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [meno s�boru]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 #, fuzzy
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--sign --encrypt [meno s�boru]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr ""
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, fuzzy, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "pou�itie %s nie je v m�de %s dovolen�\n"
 "\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [meno s�boru]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [meno s�boru]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [meno s�boru]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key id u��vate�a"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key id u��vate�a [pr�kazy]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key id u��vate�a"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "nepodarilo posla� k��� na server: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "nepodarilo sa prija� k��� zo servera: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "nepodaril sa export k���a: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "nepodarilo sa n�js� server: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "aktualiz�cia servera zlyhala: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "dek�dovanie z ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "k�dovanie do ASCII form�tu zlyhalo: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "neplatn� hashovac� algoritmus `%s'\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[meno s�boru]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Za�nite p�sa� svoju spr�vu ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "zadan� URL pre certifika�n� politiku je neplatn�\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 #, fuzzy
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "zadan� URL pre podpisov� politiku je neplatn�\n"
@@ -2933,341 +2938,346 @@ msgstr "               nov� podpisy: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      pre��tan� tajn� k���e: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr ""
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, fuzzy, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "%s podpis, hashovac� algoritmus %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr ""
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, fuzzy, c-format
 msgid "key %s: no user ID\n"
 msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, fuzzy, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "k��� %08lX: HKP po�kodenie podk���a opraven�\n"
 
 # c-format
-#: g10/import.c:773
+#: g10/import.c:813
 #, fuzzy, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: prijat� id u��vate�a '%s', ktor� nie je podp�san� n�m sam�m\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, fuzzy, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "k��� %08lX: ch�ba platn� identifik�tor u��vate�a\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "m��e to by� sp�soben� ch�baj�cim podpisom k���a n�m sam�m\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, fuzzy, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "k��� %08lX: verejn� k��� nen�jden�: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, fuzzy, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "k��� %08lX: nov� k��� - presko�en�\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "nen�jden� zapisovate�n� s�bor k���ov (keyring): %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "zapisujem do '%s'\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "chyba pri z�pise s�boru k���ov (keyring)  `%s': %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, fuzzy, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "k��� %08lX: verejn� k��� \"%s\" importovan�\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, fuzzy, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "k��� %08lX: nezodpoved� na�ej k�pii\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, fuzzy, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em n�js� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, fuzzy, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "k��� %08lX: nem��em ��ta� origin�lny blok k���a: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� identifik�tor u��vate�a\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podpis\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, fuzzy, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "k��� %08lX: \"%s\" 1 nov� podk���\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podk���ov\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch podpisov\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, fuzzy, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "k��� %08lX: \"%s\" %d nov�ch identifik�torov u��vate�a\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, fuzzy, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "k��� %08lX: \"%s\" bez zmeny\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, fuzzy, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "k��� %08lX: tajn� k��� bez verejn�ho k���a %d - presko�en�\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 #, fuzzy
 msgid "importing secret keys not allowed\n"
 msgstr "zapisujem tajn� k��� do `%s'\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "nie je nastaven� implicitn� s�bor tajn�ch k���ov %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, fuzzy, c-format
 msgid "key %s: secret key imported\n"
 msgstr "k��� %08lX: tajn� k��� importovan�\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, fuzzy, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "k��� %08lX: je u� v s�bore tajn�ch k���ov\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, fuzzy, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "k��� %08lX: nebol n�jden� tajn� k���: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, fuzzy, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "k��� %08lX: ch�ba verejn� k��� - nem��em aplikova� revoka�n� certifik�t\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - zamietnut�\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "k��� %08lX: \"%s\" revoka�n� certifik�t importovan�\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, fuzzy, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "k��� %08lX: neexistuje id u��vate�a pre podpis\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a u u��vate�sk�ho id \"%s"
 "\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, fuzzy, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr ""
 "k��� %08lX: neplatn� podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/import.c:1433
-#, fuzzy, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, fuzzy, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "k��� %08lX: nepodporovan� algoritmus verejn�ho k���a\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
+
+#: g10/import.c:1501
+#, fuzzy, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "k��� %08lX: neexistuje podk��� pre viazanie k���ov\n"
+
+#: g10/import.c:1514
 #, fuzzy, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "k��� %08lX: neplatn� v�zba podk���a\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� v�zba podk���a\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, fuzzy, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "k��� %08lX: neexistuje podk��� na revok�ciu k���a\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, fuzzy, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "k��� %08lX: neplatn� revoka�n� podk���\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, fuzzy, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "k��� %08lX: zmazan� viacn�sobn� revok�cia podk���a\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, fuzzy, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "k��� %08lX: identifik�tor u��vate�a presko�en� '"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, fuzzy, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "k��� %08lX: podk��� presko�en�\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, fuzzy, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "k��� %08lX: podpis nie je exportovate�n� (trieda %02x) - presko�en�\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, fuzzy, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "k��� %08lX: revoka�n� certifik�t na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, fuzzy, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "k��� %08lX: neplatn� revoka�n� certifik�t: %s - presko�en�\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, fuzzy, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "k��� %08lX: podpis subk���a na zlom mieste - presko�en� \n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, fuzzy, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "k��� %08lX: neo�ak�van� podpisov� trieda (0x%02X) - presko�en�\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, fuzzy, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "k��� %08lX: zisten� duplikovan� identifik�tor u��vate�a - zl��en�\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: sk��am z�ska� revoka�n� k��� %"
 "08lX\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, fuzzy, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "VAROVANIE: k��� %08lX m��e by� revokovan�: revoka�n� k��� %08lX nen�jden�.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, fuzzy, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "k��� %08lX: pridan� revoka�n� certifik�t \"%s\"\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, fuzzy, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "k��� %08lX: podpis k���a n�m sam�m (direct key signature)\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 #, fuzzy
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "verejn� k��� nes�hlas� s tajn�m!\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 #, fuzzy
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 #, fuzzy
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "presko�en�: tajn� k��� je u� v datab�ze\n"
@@ -3377,12 +3387,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Ste si ist�, �e st�le chcete podp�sa� tento k���? (a/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Nemo�no podp�sa�.\n"
 
@@ -3596,8 +3606,8 @@ msgstr ""
 msgid "Really sign? (y/N) "
 msgstr "Skuto�ne podp�sa�? "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "podpisovanie zlyhalo: %s\n"
@@ -3653,201 +3663,201 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Skuto�ne to chcete urobi�? "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "pres�vam podpis k���a na spr�vne miesto\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "ulo�i� a ukon�i�"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 #, fuzzy
 msgid "show key fingerprint"
 msgstr "vyp�sa� fingerprint"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "vyp�sa� zoznam k���ov a id u��vate�ov"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 #, fuzzy
 msgid "select subkey N"
 msgstr "vyberte identifik�tor u��vate�a N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 #, fuzzy
 msgid "check signatures"
 msgstr "revokova� podpisy"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 #, fuzzy
 msgid "sign selected user IDs locally"
 msgstr "podp�sa� k��� lok�lne"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 #, fuzzy
 msgid "sign selected user IDs with a trust signature"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "prida� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "prida� fotografick� ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 #, fuzzy
 msgid "delete selected user IDs"
 msgstr "zmaza� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 #, fuzzy
 msgid "add a subkey"
 msgstr "addkey"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr ""
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 #, fuzzy
 msgid "delete selected subkeys"
 msgstr "zmaza� sekund�rny k���"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "prida� revoka�n� k���"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 #, fuzzy
 msgid "delete signatures from the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 #, fuzzy
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 #, fuzzy
 msgid "flag the selected user ID as primary"
 msgstr "ozna�i� u��vate�sk� ID ako prim�rne"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 #, fuzzy
 msgid "toggle between the secret and public key listings"
 msgstr "prepn�� medzi vyp�san�m zoznamu tajn�ch a verejn�ch k���ov"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "vyp�sa� zoznam predvolieb (pre expertov)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "vyp�sa� zoznam predvolieb (podrobne)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 #, fuzzy
 msgid "set preference list for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 #, fuzzy
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "nemo�no pou�i� URI servera k���ov - chyba anal�zy URI\n"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 #, fuzzy
 msgid "set a notation for the selected user IDs"
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "zmeni� heslo"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "zmeni� d�veryhodnos� vlastn�ka k���a"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 #, fuzzy
 msgid "revoke signatures on the selected user IDs"
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 #, fuzzy
 msgid "revoke selected user IDs"
 msgstr "revokova� identifik�tor u��vate�a"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 #, fuzzy
 msgid "revoke key or selected subkeys"
 msgstr "revokova� sekund�rny k���"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 #, fuzzy
 msgid "enable key"
 msgstr "nastavi� k��� ako platn� (enable)"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 #, fuzzy
 msgid "disable key"
 msgstr "nastavi� k��� ako neplatn� (disable)"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 #, fuzzy
 msgid "show selected photo IDs"
 msgstr "uk�za� fotografick� ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, fuzzy, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "chyba pri ��tan� bloku tajn�ho k���a `%s': %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Tajn� k��� je dostupn�.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Na vykonanie tejto oper�cie je potrebn� tajn� k���.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Pros�m, najsk�r pou�ite pr�kaz \"toggle\" (prepn��).\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3855,242 +3865,242 @@ msgid ""
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "K��� revokovan�."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 #, fuzzy
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Skuto�ne podp�sa� v�etky id u��vate�a? "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "N�poveda: Vyberte id u��vate�a na podp�sanie\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, fuzzy, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "nezn�ma trieda podpisu"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Tento pr�kaz nie je v m�doch %s dovolen�.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Mus�te vybra� aspo� jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Nem��ete zmaza� posledn� id u��vate�a!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 #, fuzzy
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Skuto�ne odstr�ni� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 #, fuzzy
 msgid "Really remove this user ID? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "Skuto�ne odstr�ni� toto id u��vate�a? "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 #, fuzzy
 msgid "You must select exactly one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr ""
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, fuzzy, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "nem��em otvori� `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, fuzzy, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "chyba pri vytv�ran� s�boru k���ov (keyring)`%s': %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Mus�te vybra� aspo� jeden k���.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 #, fuzzy
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Skuto�ne chcete zmaza� vybran� k���e? "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 #, fuzzy
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Skuto�ne chcete zmaza� tento k���? "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 #, fuzzy
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Skuto�ne revokova� v�etky vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 #, fuzzy
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Skuto�ne revokova� toto id u��vate�a? "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 #, fuzzy
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 #, fuzzy
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Skuto�ne chcete revokova� vybran� k���e? "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 #, fuzzy
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Skuto�ne chcete revokova� tento k���? "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 #, fuzzy
 msgid "Set preference list to:\n"
 msgstr "nastavi� zoznam predvolieb"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 #, fuzzy
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by pre vybran� id u��vate�a? "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 #, fuzzy
 msgid "Really update the preferences? (y/N) "
 msgstr "Skuto�ne aktualizova� predvo�by? "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 #, fuzzy
 msgid "Save changes? (y/N) "
 msgstr "Ulo�i� zmeny? "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 #, fuzzy
 msgid "Quit without saving? (y/N) "
 msgstr "Ukon�i� bez ulo�enia? "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "aktualiz�cia zlyhala: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "aktualiz�cia tajn�ho k���a zlyhala: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "k��� nebol zmenen�, tak�e nie je potrebn� ho aktualizova�.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Digest: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Charakteristiky: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr ""
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr ""
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 #, fuzzy
 msgid "Notations: "
 msgstr "Not�cie: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "U��vate�sk� ID vo form�te PGP 2.x nem� �iadne predvo�by\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, fuzzy, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, fuzzy, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Tento k��� m��e by� revokovan� k���om %s "
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 #, fuzzy
 msgid "(sensitive)"
 msgstr "(citliv� inform�cia)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, fuzzy, c-format
 msgid "created: %s"
 msgstr "%s: nem��em vytvori�: %s\n"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, fuzzy, c-format
 msgid "revoked: %s"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, fuzzy, c-format
 msgid "expired: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, fuzzy, c-format
 msgid "expires: %s"
 msgstr " [platnos� skon��: %s]"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, fuzzy, c-format
 msgid "usage: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, fuzzy, c-format
 msgid "trust: %s"
 msgstr " d�vera: %c/%c"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr ""
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Tento k��� bol ozna�en� za neplatn� (disabled)"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr ""
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4098,19 +4108,19 @@ msgstr ""
 "Pros�m nezab�dajte, �e zobrazovan� �daje o platnosti k���ov nemusia\n"
 "by� spr�vne, pokia� znovu nespust�te program.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 #, fuzzy
 msgid "revoked"
 msgstr "[revokovan�]"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 #, fuzzy
 msgid "expired"
 msgstr "expire"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4118,7 +4128,7 @@ msgstr ""
 "VAROVANIE: �iadne ID u��vate�a nebolo ozna�en� ako prim�rne. Tento pr�kaz\n"
 "sp�sob�, �e in� ID u��vate�a sa bude pova�ova� prim�rne.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4127,75 +4137,75 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohto k���a.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le prida�? (a/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Zmaza� tento dobr� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Zmaza� tento neplatn� podpis? (a/N/u)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Zmaza� tento nezn�my podpis? (a/N/u)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Skuto�ne zmaza� tento podpis podp�san� sebou sam�m? (a/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Zmazan� %d podpis.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Zmazan�ch %d podpisov.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Ni� nebolo zmaznan�.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 #, fuzzy
 msgid "invalid"
 msgstr "neplatn� sp�sob reprezent�cie v ASCII"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "U��vate�sk� ID \"%s\" je revokovan�."
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, fuzzy, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4204,201 +4214,201 @@ msgstr ""
 "VAROVANIE: Toto je PGP2 k���. Pridanie fotografick�ho ID m��e v niektor�ch\n"
 "           verzi�ch PGP vies� k odmietnutiu tohoto k���a.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Nemali by ste prid�va� fotografick� ID k PGP2 k���u.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Vlo�te identifik�tor u��vate�a poveren�ho revok�ciou: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "k��� vo form�te PGP 2.x nemo�no poveri� revok�ciou\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "k��� nemo�no poveri� revok�ciou n�m sam�m\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 #, fuzzy
 msgid "this key has already been designated as a revoker\n"
 msgstr "VAROVANIE: Tento k��� bol revokovan� jeho ur�en�m revok�torom/!\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VAROVANIE: ozna�enie k���a ako revokovac� u� nem��e by� zru�en�!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 #, fuzzy
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "Ste si ist�, �e chcete ozna�i� tento k��� ako revokovac�? (a/N): "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Pros�m, odstr��te v�ber z tajn�ch k���ov.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 #, fuzzy
 msgid "Please select at most one subkey.\n"
 msgstr "Pros�m, vyberte najviac jeden sekund�rny k���.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 #, fuzzy
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Men�m dobu platnosti sekund�rneho k���a.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Men�m dobu platnosti prim�rneho k���a.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Nem��ete zmeni� dobu platnosti k���a verzie 3\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "V s�bore tajn�ch k���ov ch�ba zodpovedaj�ci podpis\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, fuzzy, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "VAROVANIE: podpisovac� podk��� %08lX nie je kr��ovo certifikovan�\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Pros�m, vyberte pr�ve jedno id u��vate�a.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, fuzzy, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "presko�en� v3 podpis k���a n�m sam�m u u��vate�sk�ho id \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr ""
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 #, fuzzy
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 #, fuzzy
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete pou�i�? (a/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 #, fuzzy
 msgid "Enter the notation: "
 msgstr "Podpisov� not�cia: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 #, fuzzy
 msgid "Proceed? (y/N) "
 msgstr "Prep�sa� (a/N)? "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, fuzzy, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, fuzzy, c-format
 msgid "No subkey with index %d\n"
 msgstr "Neexistuje identifik�tor u��vate�a s indexom %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, fuzzy, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "id u��vate�a: \""
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, fuzzy, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "   podp�san� %08lX v %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Platnos� podpisu vypr�� %s.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Ste si ist�, �e ho chcete st�le revokova�? (a/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vytvori� pre tento podpis revoka�n� certifik�t? (a/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 #, fuzzy
 msgid "Not signed by you.\n"
 msgstr "   podp�san� %08lX v %s%s\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, fuzzy, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Podp�sali ste nasleduj�ce identifik�tory u��vate�a:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 #, fuzzy
 msgid " (non-revocable)"
 msgstr " (nexeportovate�n�)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, fuzzy, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "   revokovan� %08lX v %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Chyst�te sa revokova� tieto podpisy:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Skuto�ne vytvori� revoka�n� certifik�ty? (a/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "neexistuje tajn� k���\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "VAROVANIE: podpis pou�ivate�k�ho ID vznikol %d sekund v bud�cnosti\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, fuzzy, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, fuzzy, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "u��vate�sk� ID \"%s\" je u� revokovan�\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, fuzzy, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5557,12 +5567,12 @@ msgstr "VAROVANIE: nastavenie v `%s' e�te nie je akt�vne\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "nem��em pracova� s algoritmom verejn�ho k���a %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr ""
 "VAROVANIE: pravdepodobne nebezpe�n� symetricky �ifrovan� k��� sedenia\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "podpaket typu %d m� nastaven� kritick� bit\n"
@@ -5954,28 +5964,28 @@ msgstr "k��� %08lX: chyba identifik�tor u��vate�a\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "d�ta neboli ulo�en�; na ich ulo�enie pou�ite prep�na� \"--output\"\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Podpis oddelen� od dokumentu.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Pros�m, vlo�te n�zov d�tov�ho s�boru: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "��tam �tandardn� vstup (stdin) ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "ch�baj� podp�san� d�ta\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "nem��em otvori� podp�san� d�ta '%s'\n"
diff --git a/po/sv.po b/po/sv.po
index 43809e22e..a24e9df60 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg trunk\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2008-07-21 09:04+0200\n"
 "Last-Translator: Daniel Nylander <[email protected]>\n"
 "Language-Team: Swedish <[email protected]>\n"
@@ -144,7 +144,7 @@ msgstr "kan inte skapa \"%s\": %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -358,7 +358,7 @@ msgid "Please enter the new passphrase"
 msgstr "Ange den nya lösenfrasen"
 
 # Här bruksanvisning för kommandoraden. Resultatet har jag översatt med "inställningar", eftersom flaggorna även kan förekomma i en inställningsfil.
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -367,103 +367,103 @@ msgstr ""
 "@Flaggor:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "kör i serverläge (förgrund)"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "kör i demonläge (bakgrund)"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "utförlig"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "var något tystare"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh-liknande kommandoutdata"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|FIL|läs inställningar från FIL"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "frigör inte från konsollen"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "fånga inte tangentbord och mus"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "använd en loggfil för servern"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "använd en standardplats för uttaget"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PRG|använd PRG som PIN-inmatningsprogrammet"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PRG|använd PRG som SCdaemon-programmet"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "använd inte SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "ignorera begäran om att ändra TTY"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "ignorera begäran om att ändra X-display"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|låt mellanlagrade PIN-koder gå ut efter N sekunder"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "använd inte mellanlagring av PIN-kod vid signering"
 
 # Antar att värdet inte ska översättas.
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "tillåt klienter att markera nycklar som \"trusted\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "tillåt förinställning av lösenfras"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "aktivera ssh-agent-emulering"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|FIL|skriv miljöinställningar även till FIL"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -471,11 +471,11 @@ msgstr "|FIL|skriv miljöinställningar även till FIL"
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Rapportera fel till <"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Användning: gpg-agent [flaggor] (-h för hjälp)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -483,145 +483,145 @@ msgstr ""
 "Syntax: gpg-agent [flaggor] [kommando [argument]]\n"
 "Hantering av hemliga nycklar för GnuPG\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "ogiltig debug-level \"%s\" angiven\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "OBS: inställningsfilen \"%s\" saknas\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "inställningsfil \"%s\": %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "läser inställningar från \"%s\"\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "%s: kan inte skapa katalog: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "namnet på uttaget är för långt\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "kan inte skapa uttag: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, 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:1510
+#: agent/gpg-agent.c:1512
 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "fel vid hämtning av nonce för uttaget\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "fel när \"%s\" bands till uttag: %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() misslyckades: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "lyssnar på uttaget \"%s\"\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "katalogen \"%s\" skapades\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() misslyckades för \"%s\": %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "kan inte använda \"%s\" som hemkatalog\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, 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:1781
+#: agent/gpg-agent.c:1786
 #, 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:1786
+#: agent/gpg-agent.c:1791
 #, 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:1806
+#: agent/gpg-agent.c:1811
 #, 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:1811
+#: agent/gpg-agent.c:1816
 #, 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:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select misslyckades: %s - väntar 1 s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s stoppad\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 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:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "miljövariabeln GPG_AGENT_INFO är felformaterad\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -839,7 +839,7 @@ msgstr "fel när ett rör skapades: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "kan inte fdopen rör för läsning: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "fel vid grening av process: %s\n"
@@ -854,7 +854,7 @@ msgstr "misslyckades med att vänta på att processen %d skulle avslutas: %s\n"
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
@@ -864,7 +864,7 @@ msgstr "fel vid körning av \"%s\": avslutsstatus %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "fel vid körning av \"%s\": antagligen inte installerat\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "fel vid körning av \"%s\": avslutades\n"
@@ -974,11 +974,16 @@ msgstr "slut på kärna i säkert minne vid allokering av %lu byte"
 msgid "out of core while allocating %lu bytes"
 msgstr "slut på kärna vid allokering av %lu byte"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "ingen körande gpg-agent - startar en\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "kan inte ansluta till agenten - försöker falla tillbaka\n"
 
@@ -1212,47 +1217,47 @@ msgid "invalid dash escaped line: "
 msgstr "ogiltig rad som börjar med bindestreck: "
 
 # överhoppad eller hoppades över?
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "ogiltigt radix64-tecken %02X hoppades över\n"
 
 # CRC Cyclic Redundancy Checksum används för att upptäcka fel i ascii-skalet. Används allmänt, trots att det inte höjer säkerheten.
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "för tidigt filslut (ingen CRC-summa)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "för tidigt filslut (i CRC-summan)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "felformaterad CRC-summa\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC-fel; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "för tidigt filslut (i den avslutande raden)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "fel i avslutande rad\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "hittade ingen giltig OpenPGP-data.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "ogiltigt ASCII-skal: raden är längre än %d tecken\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1299,7 +1304,7 @@ msgstr "OpenPGP-kort är inte tillgängligt: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "OpenPGP-kort nr. %s identifierades\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1567,7 +1572,7 @@ msgstr "hemlig nyckel redan lagrad på ett kort\n"
 msgid "error writing key to card: %s\n"
 msgstr "fel vid skrivning av nyckel: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "avsluta denna meny"
 
@@ -1575,7 +1580,7 @@ msgstr "avsluta denna meny"
 msgid "show admin commands"
 msgstr "visa administratörskommandon"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "visa denna hjälp"
 
@@ -1649,7 +1654,7 @@ msgstr "Administrationskommandon tillåts\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Administrationskommandon tillåts inte\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Ogiltigt kommando (prova med \"help\")\n"
 
@@ -1658,18 +1663,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1951,7 +1956,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Ogiltiga nyckeln %s tvingades till giltig med --allow-non-selfsigned-uid\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "ingen hemlig undernyckel för publika undernyckeln %s - hoppar över\n"
@@ -2194,7 +2199,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "Publik nyckel: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Chiffer: "
 
@@ -2202,7 +2207,7 @@ msgstr "Chiffer: "
 msgid "Hash: "
 msgstr "Kontrollsumma: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Komprimering: "
 
@@ -2350,410 +2355,410 @@ msgstr "OBS: den gamla inställningsfilen \"%s\" används inte\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt är för gammalt (behöver %s, har %s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "OBS: %s är inte för normal användning!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "\"%s\" är inte ett giltigt utgångsdatum för en signatur\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "\"%s\" är ingen giltig teckentabell\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "kunde inte tolka url till nyckelserver\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "ogiltiga flaggor för nyckelserver\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: ogiltiga importeringsflaggor\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "ogiltiga importflaggor\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: ogiltiga exportflaggor\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "ogiltiga exportinställningar\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "ogiltiga listflaggor\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "visa foto-id under signaturvalidering"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "visa policy-url:er under signaturvalidering"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "visa alla notationer under signaturvalidering"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "visa IETF-standardnotationer under signaturvalidering"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "visa användarangivna notationer under signaturvalidering"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "visa url:er till föredragna nyckelserver under signaturvalidering"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "visa giltighet för användaridentitet vid signaturvalidering"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "visa spärrade och utgångna användaridentiteter i signaturvalidering"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "visa endast primär användaridentitet i signaturvalidering"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "validera signaturer med PKA-data"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "öka tillit på signaturer med giltigt PKA-data"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "ogiltiga flaggor för validering\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "kunde inte ställa in exec-path till %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: ogiltig auto-key-locate-lista\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "ogiltig auto-key-locate-lista\n"
 
 # Programmet skapar en avbildning (image) av minnet för att lättare kunna spåra fel.
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "VARNING: programmet kan komma att skapa en minnesavbild!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "VARNING: %s gäller istället för %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s är inte tillåten tillsammans med %s!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "det är ingen poäng att använda %s tillsammans med %s!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "kommer inte att köra med osäkert minne på grund av %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr ""
 "du kan bara göra signaturer i en separat fil eller klartextsignaturer\n"
 "i --pgp2-läge\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "du kan inte signera och kryptera samtidigt i --pgp2-läge\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "du måste använda filer (och inte rör) i --pgp2-läge\n"
 
 # IDEA-algoritmen är patenterat i flera länder och finns därför inte med i GnuPG som standard.
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "kryptering av meddelanden i --pgp2-läge kräver IDEA-chiffret\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "den valda chifferalgoritmen är ogiltig\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "vald sammandragsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "vald komprimeringsalgoritm är ogiltig\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "vald algoritm för certifieringssammandrag är felaktig\n"
 
 # antalet betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "variabeln \"completes-needed\" måste ha ett värde som är större än 0\n"
 
 # antalet delvis betrodda signaturer som behövs (1-3) för att du ska lita på en nyckel du inte själv verifierat.
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "variabeln \"marginals-needed\" måste vara större än 1\n"
 
 # Hur djupt GnuPG ska leta i Web-of-trust.
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth måste vara inom intervallet från 1 till 255\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr ""
 "ogiltigt standardvärde för certifieringsnivån; måste vara 0, 1, 2 eller 3\n"
 
 # Det är nivån för hurväl du har kontrollerat att nyckeln tillhör innehavaren.
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "ogiltigt minimivärde för certifieringsnivån; måste vara 1, 2 eller 3\n"
 
 # S2K har med krypteringen av hemliga nyckeln att göra
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "OBS: enkelt S2K-läge (0) rekommenderas inte\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "ogiltigt S2K-läge; måste vara 0, 1 eller 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "ogiltiga standardinställningar\n"
 
 # Du kan ange de algoritmer du föredrar i prioritetsordning. Då avgör inte enbart standard (symmetrisk kryptering) eller mottagarens preferenser (kryptering till öppen nyckel).
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "ogiltig inställning av personligt chiffer\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "ogiltig inställning av föredragna kontrollsummealgoritmer\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "ogiltig inställning av föredragna kompressionsalgoritmer\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s fungerar ännu inte med  %s\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "du får inte använda chifferalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda sammandragsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr ""
 "du får inte använda komprimeringsalgoritmen \"%s\" när du är i %s-läget\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "misslyckades med att initialisera tillitsdatabasen: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "VARNING: mottagare (-r) angivna utan att använda publik nyckel-kryptering\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [filnamn]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [filnamn]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "symmetrisk kryptering av \"%s\" misslyckades: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [filnamn]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [filnamn]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "du kan inte använda --symmetric --encrypt i %s-läget\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [filnamn]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [filnamn]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "du kan inte använda --symmetric --sign --encrypt med --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr ""
 "du kan inte använda --symmetric --sign --encrypt när du är i %s-läget\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [filnamn]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [filnamn]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [filnamn]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key användaridentitet"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key användaridentitet [kommandon]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key användaridentitet"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "sändning till nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "hämtning från nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "export av nyckeln misslyckades: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "sökning på nyckelservern misslyckades: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "uppdatering av  nyckeln från en nyckelserver misslyckades: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "misslyckades med att ta bort ASCII-skalet: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "misslyckades med att skapa ASCII-skal: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "ogiltig kontrollsummealgoritm \"%s\"\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[filnamn]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "Skriv ditt meddelande här ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "den angivna URL som beskriver certifieringsspolicy är ogiltig\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "den angivna URL som beskriver signaturpolicy är ogiltig\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "den angivna föredragna nyckelserver-url:n är ogiltig\n"
 
@@ -2908,7 +2913,7 @@ msgstr "             signaturer rensade: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "    användaridentiteter rensade: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2917,335 +2922,340 @@ msgstr ""
 "VARNING: nyckeln %s innehåller inställningar för otillgängliga\n"
 "algoritmer för dessa användaridentiteter:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": inställning för chifferalgoritmen %s\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": inställning för sammandragsalgoritmen %s\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": inställning för komprimeringsalgoritmen %s\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "det rekommenderas starkt att du uppdaterar dina inställningar\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "och distribuerar denna nyckel igen för att undvika tänkbara problem\n"
 "med att algoritmerna inte stämmer\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "du kan uppdatera dina inställningar med: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "nyckel %s: ingen användaridentitet\n"
 
 # Undernyckeln är skadad på HKP-servern. Vanligt fel vid många undernycklar.
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "nyckeln %s: PKS-skadad undernyckel reparerades\n"
 
 # vad innebär fnutten i slutet?
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "nyckel %s: accepterade icke-självsignerad användaridentitet \"%s\"\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "nyckel %s: inga giltiga användaridentiteter\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "detta kan bero på att det saknas en självsignatur\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "nyckel %s: hittade ingen publik nyckel: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "nyckel %s: ny nyckel - hoppade över\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "hittade ingen nyckelring som gick att skriva till: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "skriver till \"%s\"\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "fel vid skrivning av nyckelringen \"%s\": %s\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "nyckel %s: publika nyckeln \"%s\" importerades\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "nyckel %s: stämmer inte mot vår lokala kopia\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "nyckel %s: kan inte hitta det ursprungliga nyckelblocket: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "nyckel %s: kan inte läsa det ursprungliga nyckelblocket %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "nyckel %s: \"%s\" 1 ny användaridentitet\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "nyckel %s: \"%s\" %d nya användaridentiteter\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "nyckel %s: \"%s\" 1 ny signatur\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "nyckel %s: \"%s\" %d nya signaturer\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "nyckel %s: \"%s\" 1 ny undernyckel\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "nyckel %s: \"%s\" %d nya undernycklar\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signatur rensad\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "nyckel %s: \"%s\" %d signaturer rensade\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentitet rensad\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "nyckel %s: \"%s\" %d användaridentiteter rensade\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "nyckel %s: \"%s\" inte ändrad\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "nyckel %s: hemlig nyckel med ogiltigt chiffer %d - hoppade över\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "import av hemliga nycklar tillåts inte\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "ingen hemlig nyckelring angiven som standard: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "nyckel %s: hemlig nyckel importerades\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "nyckel %s: finns redan i hemliga nyckelringen\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "nyckel %s: hittade inte hemlig nyckel: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "nyckel %s: ingen publik nyckel - kan inte verkställa spärrcertifikat\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - avvisat\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat importerat\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "nyckel %s: ingen användaridentitet för signaturen\n"
 
 # fixme: I appended the %s -wk
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "nyckel %s: algoritmen för publika nycklar stöds inte för "
 "användaridentiteten  \"%s\"\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "nyckel %s: ogiltig självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "nyckel %s: algoritmen för publika nycklar stöds inte\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "nyckel %s: ingen undernyckel för nyckelbindning\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "nyckel %s: ogiltig undernyckelbindning\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "nyckel %s: tog bort flera undernyckelbindningar\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "nyckel %s: ingen undernyckel för nyckelspärrning\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "nyckel %s: ogiltig spärr av undernyckel\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "nyckel %s: tog bort flera spärrar av undernyckel\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "nyckel %s: hoppade över användaridentiteten \"%s\"\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "nyckel %s: hoppade över undernyckel\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "nyckel %s: icke-exporterbar signatur (klass 0x%02X) - hoppade över\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "nyckel %s: spärrcertifikat på fel plats - hoppade över\n"
 
 # nyckeln eller certifikatet??
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "nyckel %s: ogiltigt spärrcertifikat: %s - hoppade över\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "nyckel %s: signatur på undernyckel på fel plats - hoppade över\n"
 
 # nyckeln eller klassen?
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "nyckel %s: oväntad signaturklass  (0x%02X) - hoppade över\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr ""
 "nyckel %s: dubblett av användaridentiteten hittades - slog samman dem\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: hämtar spärrnyckeln %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "VARNING: nyckeln %s kan ha spärrats: spärrnyckeln %s saknas.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "nyckel %s: \"%s\" spärrcertifikat lades till\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "nyckel %s: lade till direkt nyckelsignatur\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr ""
 "OBSERVERA: serienumret för en nyckel stämmer inte med kortets serienummer\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "OBSERVERA: primärnyckeln är ansluten och lagrad på kort\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "OBSERVERA: sekundärnyckeln är ansluten och lagrad på kort\n"
 
@@ -3355,12 +3365,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Användaridentiteten \"%s\" är spärrad."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Vill du verkligen fortfarande signera den? (j/N)"
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  Kan inte signera.\n"
 
@@ -3547,8 +3557,8 @@ msgstr "Jag har gjort en noggrann kontroll av denna nyckel.\n"
 msgid "Really sign? (y/N) "
 msgstr "Verkligen signera? (j/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "signeringen misslyckades: %s\n"
@@ -3604,187 +3614,187 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Vill du verkligen göra detta? (j/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "flyttar en nyckelsignatur till den rätta platsen\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "spara och avsluta"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "visa nyckelns fingeravtryck"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "lista nycklar och användaridentiteter"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "välj användaridentiteten N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "välj undernyckel N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "kontrollera signaturer"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "signera valda användaridentiteter [* se nedan för relaterade kommandon]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "signera valda användaridentiteter lokalt"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "signera valda användaridentiteter med en tillitssignatur"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "signera valda användaridentiteter med en icke-spärrbar signatur"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "lägg till en användaridentitet"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "lägg till ett foto-id"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "ta bort valda användaridentiteter"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "lägg till en undernyckel"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "lägg till en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "flytta en nyckel till ett smartkort"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "flytta en nyckelkopia till ett smartkort"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "ta bort valda undernycklar"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "lägg till en spärrnyckel"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "ta bort signaturer från valda användaridentiteter"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "ändra utgångsdatumet för nyckeln eller valda undernycklar"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "flagga vald användaridentitet som primär"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "växla mellan att lista hemliga och publika nycklar"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "lista inställningar (expertläge)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "lista inställningar (utförligt)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "ställ in inställningslista för valda användaridentiteter"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "ställ in url till föredragen nyckelserver för valda användaridentiteter"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "ställ in en notation för valda användaridentiteter"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "ändra lösenfrasen"
 
 # originalet borde ha ett value
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "ändra ägartillitsvärdet"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "spärra signaturer på valda användaridentiteter"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "spärra valda användaridentiteter"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "spärra nyckel eller valda undernycklar"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "aktivera nyckel"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "inaktivera nyckel"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "visa valda foto-id:n"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort oanvändbara "
 "signaturer från nyckeln"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "komprimera oanvändbara användaridentiteter och ta bort alla signaturer från "
 "nyckeln"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "fel vid läsning av hemligt nyckelblock \"%s\": %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Den hemliga nyckeln finns tillgänglig.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Den hemliga nyckeln behövs för att göra detta.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "Använd kommandot \"toggle\" först.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3797,229 +3807,229 @@ msgstr ""
 "signaturer\n"
 "  (nrsign), eller en kombination av dessa (ltsign, tnrsign, etc.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Nyckeln är spärrad."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Verkligen signera alla användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "Tips: Välj de användaridentiteter som du vill signera\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "Okänd signaturtyp \"%s\"\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "Detta kommando är inte tillåtet när du är i %s-läge.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "Du måste välja åtminstone en användaridentitet.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Du kan inte ta bort den sista användaridentiteten!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "Verkligen ta bort alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Verkligen ta bort denna användaridentitet? (j/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Verkligen flytta den primära nyckeln? (j/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Du måste välja exakt en nyckel.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Kommandot förväntar ett filnamnsargument\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "Kan inte öppna \"%s\": %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "Fel vid läsning av säkerhetskopierad nyckel från \"%s\": %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "Du måste välja åtminstone en nyckel.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Vill du verkligen ta bort de valda nycklarna? (j/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Vill du verkligen ta bort denna nyckel? (j/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "Verkligen spärra alla valda användaridentiteter? (j/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "Verkligen spärra denna användaridentitet? (j/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "Vill du verkligen spärra hela nyckeln? (j/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "Vill du verkligen spärra de valda undernycklarna? (j/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "Vill du verkligen spärra denna undernyckel? (j/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Ägartillit får inte ställas in när en tillitsdatabas används som användaren "
 "tillhandahåller\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Ställ in inställningslista till:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Vill du verkligen uppdatera inställningarna för valda användaridentiteter? "
 "(j/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Vill du verkligen uppdatera inställningarna? (j/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Spara ändringar? (j/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Avsluta utan att spara? (j/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "uppdateringen misslyckades: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "misslyckades med att uppdatera hemligheten: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Nyckeln är oförändrad så det behövs ingen uppdatering.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Sammandrag: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Funktioner: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Nyckelserver no-modify"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Föredragen nyckelserver: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Notationer: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr ""
 "Du kan inte ange några inställningar för en användaridentitet av PGP 2.x-"
 "typ.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "Den här nyckeln blev spärrad den %s av %s nyckel %s\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "Den här nyckeln kan vara spärrad av %s nyckel %s"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(känsligt)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "skapat: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "spärrad: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "utgånget: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "går ut: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "tillit: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "giltighet: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Denna nyckel har stängts av"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "kortnummer: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4027,17 +4037,17 @@ msgstr ""
 "Observera! Den visade nyckelgiltigheten kan vara felaktig\n"
 "såvida inte du startar om programmet.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "spärrad"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "utgånget"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4046,7 +4056,7 @@ msgstr ""
 "Detta kommando kan göra att en annan användaridentitet antas\n"
 "vara den primära identiteten.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4055,75 +4065,75 @@ msgstr ""
 "VARNING: Detta är en nyckel av PGP2-typ.  Om du lägger till ett foto-id kan\n"
 "         vissa versioner av PGP avvisa denna nyckel.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Vill du verkligen fortfarande lägga till den? (j/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "Du kan inte lägga till ett foto-id till en nyckel av PGP 2-typ.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Vill du radera denna korrekta signatur? (j/N/a)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Vill du radera denna ogiltiga signatur? (j/N/a)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Vill du radera denna okända signatur? (j/N/a)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Verkligen ta bort denna självsignatur? (j/N)"
 
 # skulle lika gärna kunna heta 1 signatur va?
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "Raderade %d signatur.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "Raderade %d signaturer.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Ingenting raderat.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "ogiltigt"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "Användaridentiteten \"%s\" komprimerad: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Användaridentitet \"%s\": %d signaturer borttagna\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "Användaridentitet \"%s\": redan minimerad\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "Användaridentitet \"%s\": redan rensad\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4133,199 +4143,199 @@ msgstr ""
 "denna\n"
 "         nyckel inte användas i vissa versioner av PGP.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "Du får inte lägga till en spärrnyckel för en PGP 2.x-nyckel.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "Ange användaridentiteten för spärrnyckeln: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "det går inte att använda en PGP 2.x-nyckel som spärrnyckel\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "du kan inte ange en nyckel som sin egen spärrnyckel\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "den här nyckeln har redan markerats som en spärrnyckel\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "VARNING: det går aldrig att ångra om du utser en spärrnyckel!\n"
 
 # designated = angiven (utnämnd, utpekad, bestämd, utsedd, avsedd, angiven, designerad)
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Är du säker på att du vill använda den här nyckeln för spärrning? (j/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Tag bort markeringar från de hemliga nycklarna.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Välj som mest en undernyckel.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Ändrar utgångstid för en undernyckel.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Ändrar giltighetstid för den primära nyckeln.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Du kan inte ändra giltighetsdatum för en v3-nyckel\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Det finns ingen motsvarande signatur i den hemliga nyckelringen\n"
 
 # Vad betyder det?
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "signeringsundernyckeln %s är redan korscertifierad\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "undernyckeln %s signerar inte och behöver inte korscertifieras\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Välj endast en användaridentitet.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "hoppar över v3-självsignatur på användaridentiteten \"%s\"\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Ange din föredragna nyckelserver-url: "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Är du säker på att du vill ersätta det? (j/N) "
 
 # Obs! Syftar på bildfilen med ditt foto. Meddelandet visas om du valt en mycket stor fil.
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Är du säker på att du vill ta bort det? (j/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Ange notationen: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "Fortsätt? (j/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "Ingen användaridentitet med indexet %d\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "Ingen användaridentitet med hashen %s\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "Ingen undernyckel med indexet %d\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "användaridentitet: \"%s\"\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "signerat av din nyckel %s den %s%s%s\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr "  (icke exporterbar)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Denna signatur gick ut den %s.\n"
 
 # nyckel? signatur?
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Är du säker på att du fortfarande vill spärra den? (j/N)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "Vill du skapa ett spärrcertifikat för denna signatur? (j/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Du har signerat följande användaridentiteter med nyckeln %s:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (inte spärrbar)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "spärrad av din nyckel %s den %s\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Du är på väg att spärra dessa signaturer:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "Vill du verkligen skapa spärrcertifikatet? (j/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "ingen hemlig nyckel\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "användaridentiteten \"%s\" är redan spärrad\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr ""
 "VARNING: en signatur på en användaridentitet är daterad %d sekunder in i "
 "framtiden\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Nyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Undernyckeln %s är redan spärrad.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "Visar %s foto-id med storleken %ld för nyckeln %s (uid %d)\n"
@@ -5485,11 +5495,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "kan inte hantera algoritmen %d för publika nycklar\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "VARNING: potentiellt osäker symmetriskt krypterad sessionsnyckel\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "underpaket av typen %d har den bit satt som markerar den som kritisk\n"
@@ -5879,30 +5889,30 @@ msgstr "Observera: nyckeln %s har ingen inställning för %s\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "data sparades inte, använd flaggan \"--output\" för att spara det\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Signatur i en separat fil.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Ange namnet på datafilen: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "läser från standard in ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "ingen signerad data\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "kan inte öppna signerat data \"%s\"\n"
 
 # se förra kommentaren
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "kan inte öppna signerad data fd=%d: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 385546413..9a899f885 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: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2008-12-14 23:25+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <[email protected]>\n"
 "Language-Team: Turkish\n"
@@ -121,7 +121,7 @@ msgstr "\"%s\" oluşturulamıyor: %s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -331,7 +331,7 @@ msgstr "Yeni anahtarınızı korumak için Lütfen%0AAnahtar Parolanızı girini
 msgid "Please enter the new passphrase"
 msgstr "Lütfen yeni anahtar parolasını girin"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -340,102 +340,102 @@ msgstr ""
 "@Seçenekler:\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "sunucu olarak (önalanda) çalışır"
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "artalan süreci olarak çalışır"
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "ayrıntılı"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "biraz daha sessiz olur"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh tarzı komut çıktısı"
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|DOSYA|seçenekler DOSYAdan okunur"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "konsoldan kopulmaz"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "klavye ve fare gaspedilmez"
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "sunucu için bir günlük dosyası kullanılır"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "soket için standart bir yer kullanılır"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|UYG|PIN girme uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "[UYG|Akıllı kart uygulaması olarak UYG kullanılır"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "Akıllı kart süreci kullanılmaz"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "TTY değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "X birimi değiştirme istekleri yoksayılır"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|arabellekteki PINler N saniyede zamanaşımına uğrar"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "imzalarken PIN arabelleği kullanılmaz"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "istemcilerin anahtarları \"güvenilir\" olarak imlemesine izin verilir"
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "anahtar parolasının önceden atanmasına izin verilir"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "ssh-agent öykünümü etkinleşir"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -443,11 +443,11 @@ msgstr "|DOSYA|ortam ayarlarını ayrıca DOSYAya da yazar"
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "Yazılım hatalarını lütfen <"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "Kullanımı: gpg [seçenekler] (yardım için -h)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -455,144 +455,144 @@ msgstr ""
 "Sözdizimi: gpg-agent [seçenekler] [komut [arg ...]]\n"
 "GnuPG için gizli anahtar yönetimi\n"
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "belirtilen hata seviyesi `%s' geçersiz\n"
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, 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:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "seçenek dosyası \"%s\": %s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "\"%s\"den seçenekler okunuyor\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "`%s' dizini oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "soketin ismi çok uzun\n"
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "soket oluşturulamıyor: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "soketin ismi `%s' çok uzun\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 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:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "soket için tuz alınırken hata\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "soket `%s'e bağlanırken hata: %s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "soket dinleme başarısız: %s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "`%s' soketi dinlemede\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "dizin `%s' oluşturuldu\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, 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:1629
+#: agent/gpg-agent.c:1631
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "`%s' ev dizini olarak kullanılamıyor\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "fd %d üzerinde tuz okunurken hata: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, 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:1786
+#: agent/gpg-agent.c:1791
 #, 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:1806
+#: agent/gpg-agent.c:1811
 #, 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:1811
+#: agent/gpg-agent.c:1816
 #, 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:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, 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:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s durdu\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr "bu oturumda çalışan gpg-agent yok\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO çevre değişkeni hatalı\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -808,7 +808,7 @@ msgstr "boru oluşturulurken hata: %s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "okumak için boruya fdopen yapılamadı: %s\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "süreç çatallanırken hata: %s\n"
@@ -823,7 +823,7 @@ msgstr "süreç %d sonlanacak diye beklerken başarısızlık: %s\n"
 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:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
@@ -833,7 +833,7 @@ msgstr "`%s' çalışırken hata: çıkış durumu: %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "`%s' çalıştırılırken hata: muhtemelen kurulu değil\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "`%s' çalışırken hata: sonlandırıldı\n"
@@ -942,11 +942,16 @@ msgstr "%lu bayt ayrılırken güvenli bellekte nüve dışına çıkıldı"
 msgid "out of core while allocating %lu bytes"
 msgstr "%lu bayt ayrılırken nüve dışına çıkıldı"
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "çalışan gpg-agent yok - bir tane başlatılıyor\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "aracıya bağlanılamıyor - son çareye başvuruluyor\n"
 
@@ -1178,46 +1183,46 @@ msgstr "beklenmeyen zırh: "
 msgid "invalid dash escaped line: "
 msgstr "araçizgisi escape'lı satır geçersiz: "
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "geçersiz radix64 karakteri %02X atlandı\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "dosya sonu belirsiz (CRC yok)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "dosya sonu belirsiz (CRC içinde)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC bozulmuş\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC hatası; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "dosya sonu belirsiz (kuyruk içinde)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "kuyruk satırında hata\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "geçerli OpenPGP verisi yok\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "geçersiz zırh: satır %d karakterden uzun\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr ""
@@ -1262,7 +1267,7 @@ msgstr "OpenPGP anahtarı kullanılabilir değil: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "%s numaralı OpenPGP kartı saptandı\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 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"
@@ -1528,7 +1533,7 @@ msgstr "gizli anahtar zaten bir kartın üzerinde saklı\n"
 msgid "error writing key to card: %s\n"
 msgstr "anahtarı yazarken hata: %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "bu menüden çık"
 
@@ -1536,7 +1541,7 @@ msgstr "bu menüden çık"
 msgid "show admin commands"
 msgstr "yönetici komutlarını gösterir"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "bunu gösterir"
 
@@ -1608,7 +1613,7 @@ msgstr "Yönetici komutlarına izin verilir\n"
 msgid "Admin commands are not allowed\n"
 msgstr "Yönetici komutlarına izin verilmez\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "Komut geçersiz (\"help\" komutunu deneyin)\n"
 
@@ -1616,18 +1621,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:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1907,7 +1912,7 @@ msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr ""
 "Geçersiz %s anahtarı --allow-non-selfsigned-uid kullanılarak geçerli oldu\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr ""
@@ -2143,7 +2148,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "GenAnah: "
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "Şifre: "
 
@@ -2151,7 +2156,7 @@ msgstr "Şifre: "
 msgid "Hash: "
 msgstr "Hash: "
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "Sıkıştırma: "
 
@@ -2294,399 +2299,399 @@ msgstr "BİLGİ: eski öntanımlı seçenekler dosyası `%s' yoksayıldı\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt çok eski (%s lazım, sizinki %s)\n"
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "BİLGİ: %s normal kullanım için değil!\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "'%s' geçerli bir imza zamanaşımı değil\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "'%s' geçerli bir karakter kümesi değil\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "anahtar sunucusunun adresi çözümlenemedi\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "anahtar sunucusu seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: geçersiz içselleştirme seçenekleri\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "içselleştirme seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d geçersiz dışsallaştırma seçenekleri\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "dışsallaştırma seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "liste seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "imza doğrulaması sırasında foto kimliklerini gösterir"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "imza doğrulaması sırasında poliçe adreslerini gösterir"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "imza doğrulaması sırasında tüm simgelemi gösterir"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "imza doğrulaması sırasında IETF standart simgelemlerini gösterir"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kaynaklı simgelemleri gösterir"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr ""
 "imza doğrulaması sırasında tercih edilen anahtar sunucusu adresleri "
 "gösterilir"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "imza doğrulaması sırasında kullanıcı kimliği geçerliliğini gösterir"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr ""
 "imza doğrulamasında yürürlükten kaldırılan ve zamanaşımına uğrayan kullanıcı "
 "kimlikleri gösterilir"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "imza doğrulamasında sadece birincil kullanıcı kimlik gösterilir"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "imzaları PKA verisi ile doğrular"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "imzaların güvenilirliğini geçerli PKA verisi ile yükseltir"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "doğrulama seçenekleri geçersiz\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "çalıştırılabilirlerin patikası %s yapılamıyor\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "özdevinimli anahtar konumlama listesi geçersiz\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "UYARI: program bir \"core\" dosyası oluşturabilir!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "UYARI: %s %s'i aşıyor\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s ile %s birlikte kullanılmaz!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s, %s ile etkisiz olur!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "%s olmasından dolayı güvensiz bellekle çalıştırılmayacak\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "--pgp2 kipindeyken sadece ayrık veya sade imzalar yapabilirsiniz\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "--pgp2 kipinde aynı anda hem imzalama hem de şifreleme yapamazsınız\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "--pgp2 ile çalışırken veri yolu yerine dosyaları kullanmalısınız.\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "--pgp2 kipinde ileti şifrelemesi IDEA şifresi gerektirir\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "seçilen özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "seçilen şifre algoritması geçersiz\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "seçilen sertifikalama özet algoritması geçersiz\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "\"completes-needed\" 0 dan büyük olmalı\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "\"marginals-needed\" 1 den büyük olmalı\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "\"max-cert-depth\" 1 ile 255 arasında olmalı\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "öntanımlı sertifika seviyesi geçersiz; 0, 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "asgari sertifika seviyesi geçersiz; 1, 2, ya da 3 olabilir\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "BİLGİ: basit S2K kipi (0) kesinlikle tavsiye edilmez\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "S2K kipi geçersiz; 0, 1 veya 3 olmalı\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "öntanımlı tercihler geçersiz\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "kişisel şifre tercihleri geçersiz\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "kişisel özet tercihleri geçersiz\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "kişisel sıkıştırma tercihleri geçersiz\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s, %s ile henüz çalışmıyor\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' şifreleme algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' özet algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "%2$s kipindeyken '%1$s' sıkıştırma algoritması kullanılamaz\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "\"TrustDB\" güvence veritabanı başlangıç aşamasında başarısız: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr ""
 "UYARI: alıcılar (-r) genel anahtar şifrelemesi kullanılmadan belirtilmiş\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [dosyaismi]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [dosyaismi]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' için simetrik şifreleme başarısız: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [dosyaismi]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "%s kipindeyken  --symmetric --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [dosyaismi]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [dosyaismi]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "--s2k-mode 0 ile --symmetric --sign --encrypt kullanamazsınız\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "%s kipindeyken --symmetric --sign --encrypt kullanamazsınız.\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [DOSYA]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [dosyaismi]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [dosyaismi]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key kullanıcı-kimliği [komutlar]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key kullanıcı-kimliği"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "anahtar sunucusuna gönderim başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "anahtar sunucusundan alım başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "anahtar ihracı başarısızlığa uğradı: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "anahtar sunucusunda arama başarısız: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "anahtar sunucusunda tazeleme başarısız: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "zırhın kaldırılması başarısız: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "zırhlama başarısız: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "`%s' çittirim algoritması geçersiz\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[dosyaismi]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "İletinizi yazın ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "belirtilen sertifika güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "belirtilen imza güvence adresi geçersiz\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "belirtilen anahtar sunucusu adresi geçersiz\n"
 
@@ -2837,7 +2842,7 @@ msgstr "    temizlenen imzalar: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "     temizlenen kullanıcı kimlikleri: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -2846,337 +2851,342 @@ msgstr ""
 "UYARI: anahtar %s bu kullanıcı kimliklerde kullanışsız algoritmalar için "
 "tercihler içeriyor:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": şifreleme algoritması %s için tercih edilir\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": özet algoritması %s için tercih edilir\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr ""
 "         \"%s\": sıkıştırma algoritması %s için tercih edilir\n"
 "\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "tercihlerinizi güncellemenizi ve\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr ""
 "olası algoritma uyuşmazlığı sorunlarından kaçınmak için bu anahtarı\n"
 "tekrar dağıtmanızı şiddetle öneririz.\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr ""
 "tercihlerinizi böyle güncelleyemezsiniz: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "anahtar %s: kullanıcı kimliği yok\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "anahtar %s: PKS yardımcı anahtar bozulması giderildi\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "anahtar %s: öz-imzalı olmayan kullanıcı kimliği \"%s\" kabul edildi\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "anahtar %s: geçerli kullanıcı kimliği yok\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "bu kayıp bir öz-imza yüzünden meydana gelebilir\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "anahtar %s: genel anahtar yok: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "anahtar %s: yeni anahtar - atlandı\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "yazılabilir bir anahtar zinciri yok: %s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "\"%s\"e yazıyor\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "\"%s\" anahtarlığına yazarken hata oluştu: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "anahtar %s: genel anahtar \"%s\" alındı\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "anahtar %s: bizim kopyamızla eşleşmiyor\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku bulunamadı: %s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "anahtar %s: özgün anahtar bloku okunamadı: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "anahtar %s: \"%s\" 1 yeni kullanıcı kimliği\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "anahtar %s: \"%s\" %d yeni kullanıcı kimliği\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "anahtar %s: \"%s\" 1 yeni imza\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "anahtar %s: \"%s\" %d yeni imza\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "anahtar %s: %s 1 yeni yardımcı anahtar\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "anahtar %s: \"%s\" %d yeni yardımcı anahtar\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "anahtar %s: \"%s\" %d imza temizlendi\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "anahtar %s: \"%s\" %d kullanıcı kimliği temizlendi\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "anahtar %s: \"%s\" değişmedi\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "anahtar %s: geçersiz şifreli (%d) gizli anahtar - atlandı\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "gizli anahtarı alımına izin verilmez\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "öntanımlı gizli anahtar zinciri yok: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "anahtar %s: gizli anahtar alındı\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "anahtar %s: zaten gizli anahtar zincirinde\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "anahtar %s: gizli anahtar yok: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr ""
 "anahtar %s: genel anahtar değil - yürürlükten kaldırma sertifikası "
 "uygulanamaz\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr ""
 "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - reddedildi\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası alındı\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "anahtar %s: imza için kullanıcı kimliği yok\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr ""
 "anahtar %s: genel anahtar algoritması, kullanıcı kimliği \"%s\" için "
 "desteklenmiyor\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" için öz-imza geçersiz\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "anahtar %s: genel anahtar algoritması desteklenmiyor\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "anahtar %s: anahtarı garantilemek için yardımcı anahtar yok\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "anahtar %s: yardımcı anahtar garantileme geçersiz\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "anahtar %s: çok sayıda yardımcı anahtar bağlantısı silindi\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "anahtar %s: anahtarı yürürlükten kaldırılacak yardımcı anahtar yok\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "anahtar %s: yardımcı anahtar yürürlükten kaldırması geçersiz\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr ""
 "anahtar %s: çok sayıda yardımcı anahtar yürürlükten kaldırması silindi\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "anahtar %s: kullanıcı kimliği \"%s\" atlandı\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "anahtar %s: yardımcı anahtar atlandı\n"
 
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "anahtar %s: imza gönderilebilir değil (0x%02X sınıfı) - atlandı\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "anahtar %s: yürürlükten kaldırma sertifikası geçersiz: %s - atlandı\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "anahtar %s: yardımcı anahtar imzası yanlış yerde - atlandı\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "anahtar %s: umulmayan imza sınıfı (0x%02X) - atlandı\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "anahtar %s: çift kullanıcı kimliği saptandı - birleştirildi\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olmalı: yürürlükten kaldırma "
 "anahtarı %s alınıyor\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr ""
 "UYARI: anahtar %s yürürlükten kaldırılmış olabilir: yürürlükten kaldırma "
 "anahtarı %s mevcut değil.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "anahtar %s: \"%s\" yürürlükten kaldırma sertifikası eklendi\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "anahtar %s: doğrudan anahtar imzası eklendi\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "BİLGİ: bir anahtarın seri numarası kartlardan biriyle uyuşmuyor\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "BİLGİ: asıl anahtar kart üzerinde saklı ve kullanılabilir\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "BİLGİ: ikincil anahtar kart üzerinde saklı ve kullanılabilir\n"
 
@@ -3285,12 +3295,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "Kullanıcı kimliği \"%s\" yürürlükten kaldırıldı."
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "Onu yine de imzalamak istiyor musunuz? (e/H veya y/N) "
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  İmzalanamıyor.\n"
 
@@ -3481,8 +3491,8 @@ msgstr "Bu anahtarı çok dikkatle sınadım.\n"
 msgid "Really sign? (y/N) "
 msgstr "Gerçekten imzalayacak mısınız? (e/H veya y/N) "
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "imzalama başarısız: %s\n"
@@ -3540,190 +3550,190 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "Gerçekten bunu yapmak istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "bir anahtar imzası doğru yere taşınıyor\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "kaydet ve çık"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "parmakizini gösterir"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "anahtarı ve kullanıcı kimliğini gösterir"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "N kullanıcı kimliğini seçer"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "N yardımcı anahtarını"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "imzaları sınar"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr ""
 "seçilen kullanıcı kimliği imzalar [* ilgili komutlar için aşağıya bakın]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "kullanıcı kimlikleri yerel olarak imzalar"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "seçili kullanıcı kimlikleri bir güvence imzasıyla imzalar"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr ""
 "seçili kullanıcı kimlikleri yürürlükten kaldırılamayan bir imzayla imzalar"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "bir kullanıcı kimliği ekler"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "bir foto kimliği ekler"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "seçili kullanıcı kimlikleri siler"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "bir yardımcı anahtar ekler"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "bir akıllı karta bir anahtar ekler"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "bir akıllı karttan bir anahtarı taşır"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "bir akıllı karttan bir yedekleme anahtarını taşır"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "seçili yardımcı anahtarları siler"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "bir yürürlükten kaldırma anahtarı ekler"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "seçili kullanıcı kimliklerden imzaları siler"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr ""
 "anahtar için ya da seçili yardımcı anahtarlar için zamanaşımı tarihini "
 "değiştirir"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "seçili kullanıcı kimliğini asıl olarak imler"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "genel ve gizli anahtar listeleri arasında yer değiştirir"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "tercihleri listeler (uzman)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "tercihleri listeler (ayrıntılı)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "Seçili kullanıcı kimlikler için tercih listesini belirler "
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr ""
 "seçili kullanıcı kimlikler için tercih edilen anahtar sunucu adresini "
 "belirler"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "seçili kullanıcı kimlikleri için bir simgelem belirler"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "anahtar parolasını değiştirir"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "sahibiningüvencesini değiştirir"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "Seçili tüm kullanıcı kimliklerdeki imzaları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "Seçili tüm kullanıcı kimlikleri yürürlükten kaldırır"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "anahtarı ya da seçili yardımcı anahtarları yürürlükten kaldırır"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "anahtarı kullanıma sokar"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "anahtarı iptal eder"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "seçili foto kimlikleri gösterir"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimlikleri sıkıştırır ve kullanışsız imzaları "
 "anahtardan kaldırır"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr ""
 "kullanışsız kullanıcı kimlikleri sıkıştırır ve tüm imzaları anahtardan "
 "kaldırır"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "gizli anahtar bloğu \"%s\" okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "Gizli anahtar mevcut.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "Bunu yapmak için gizli anahtar gerekli.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "lütfen önce \"seçmece\" komutunu kullanın.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3735,240 +3745,240 @@ msgstr ""
 "  için 'nr', yerel imzalar için 'l' (lsign) veya buların karışımı   olarak "
 "(ltsign, tnrsign gibi).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "Anahtar yürürlükten kaldırıldı."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "Tüm kullanıcı kimlikler gerçekten imzalanacak mı? (e/H ya da y/N)"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "İpucu: İmzalamak için bir kullanıcı kimliği seçiniz\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "imza türü `%s' bilinmiyor\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "%s kipindeyken bu komut kullanılamaz.\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "En az bir kullanıcı kimliği seçmelisiniz.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "Son kullanıcı kimliğini silemezsiniz!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikler gerçekten silinecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "Bu kullanıcı kimliği gerçekten silinecek mi? (e/H ya da y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "Bu öz-imza gerçekten taşınacak mı?  (e/H ya da y/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "Sadece ve sadece bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "Komut değiştirge olarak bir dosya ismi gerektiriyor\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "`%s' açılamıyor: %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "yedekleme anahtarı `%s' den okunurken hata oluştu: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "En az bir anahtar seçmelisiniz.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "Seçili anahtarları gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "Bu anahtarı gerçekten silmek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr ""
 "Seçilen tüm kullanıcı kimlikleri gerçekten yürülükten kaldırılacak mı? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr ""
 "Bu kullanıcı kimliği gerçekten yürürlükten kaldırılacak mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr ""
 "Anahtarın tamamını yürürlükten kaldırmayı gerçekten istiyor musunuz? (e/H ya "
 "da y/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr ""
 "Seçili yardımcı anahtarları gerçekten yürürlükten kaldırmak istiyor musunuz? "
 "(e/H ya da y/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr ""
 "Bu yardımcı anahtarı gerçekten yürürlükten kaldırmak istiyor musunuz? (e/H "
 "ya da y/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr ""
 "Kullanıcı taraından sağlanmış bir güvence veritabanı kullanılarak "
 "sahibiningüvencesi belirlenemez\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "Belirlenecek tercih listesi:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr ""
 "Seçili kullanıcı kimlikler için tercihleri gerçekten güncellemek istiyor "
 "musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "Tercihleri gerçekten güncellemek istiyor musunuz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "Değişiklikler kaydedilecek mi? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "Kaydetmeden çıkılsın mı? (e/H ya da y/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "gizliyi güncelleme başarısız: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "Güncelleme gereği olmadığından anahtar değişmedi.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "Özet: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "Özellikler: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "Anahtar sunucusu değişmez"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "Tercih edilen anahtar sunucusu: "
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "Simgelemler: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "Bir PGP 2.x tarzı kullanıcı kimliğine uygun tercih yok.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr ""
 "Bu anahtar %2$s tarafından %3$s anahtarıyla %1$s üzerinde yürürlükten "
 "kaldırılmış\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr ""
 "Bu anahtar %s tarafından %s anahtarıyla yürürlükten kaldırılmış olabilir"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(duyarlı)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "oluşturuldu: %s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "yürürlükten kaldırıldı: %s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "son kullanma tarihi: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "kullanımı: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "güvencesi: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "geçerliliği: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "Bu anahtar iptal edilmişti"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "kart-no: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -3976,17 +3986,17 @@ msgstr ""
 "Gösterilen anahtarın, uygulamayı yeniden başlatıncaya kadar, gerekli\n"
 "doğrulukta olmayacağını lütfen gözönüne alınız.\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "yürürlükten kaldırıldı"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "zamanaşımına uğradı"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -3995,7 +4005,7 @@ msgstr ""
 "       farklı bir kullanıcı kimliğin birincil kullanıcı kimlik olarak\n"
 "       kabul edilmesini sağlayabilirsiniz.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -4004,74 +4014,74 @@ msgstr ""
 "UYARI: Bu PGP-2 tarzı bir anahtar. Bir foto kimliği eklenmesi bu anahtarın\n"
 "       bazı PGP sürümleri tarafından reddedilmesi ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "Onu yine de eklemek istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "PGP2 tarzı bir anahtara bir foto kimliği ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "Bu doğru imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "Bu geçersiz imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "Bu bilinmeyen imza silinsin mi? (e/H/k veya y/N/k)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "Bu öz-imza gerçekten silinecek mi? (e/H veya y/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "%d imza silindi.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "Hiçbir şey silinmedi.\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "geçersiz"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "kullanıcı kimliği \"%s\" yoğun: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "Kullanıcı kimliği \"%s\": %d imza temizlendi\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "kullanıcı kimliği \"%s\": zaten küçük\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "kullanıcı kimliği \"%s\": zaten temiz\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4081,208 +4091,208 @@ msgstr ""
 "       eklenmesi bu anahtarın bazı PGP sürümleri tarafından reddedilmesi\n"
 "       ile sonuçlanabilir.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr ""
 "PGP2 tarzı bir anahtara tasarlanmış bir yürürlükten kaldırıcı "
 "ekleyemeyebilirsiniz.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr ""
 "Tasarlanmış yürürlükten kaldırma anahtarının kullanıcı kimliğini giriniz: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr ""
 "bir PGP 2.x tarzı anahtar bir tasarlanmış yürürlükten kaldırma anahtarı "
 "olarak atanamaz\n"
 
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr ""
 "bir anahtarı kendisini yürürlükten kaldıracak anahtar olarak "
 "kullanamazsınız\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "bu anahtar zaten onu üreten tarafından yürürlükten kaldırılmıştı\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr ""
 "UYARI: yürürlükten kaldıran olarak tasarlanmış bir anahtar başka amaçla\n"
 "       kullanılamaz!\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr ""
 "Bu anahtarın, yürürlükten kaldıran anahtar olmasını istediğinizden emin "
 "misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "Lütfen gizli anahtarlardan seçilenleri silin.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "Lütfen en fazla bir yardımcı anahtar seçin.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "Bir yardımcı anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "Asıl anahtar için son kullanma tarihi değiştiriliyor.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "Bir v3 anahtarının son kullanma tarihini değiştiremezsiniz\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "Gizli anahtar demetinde uygun/benzer imza yok\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "yardımcı imzalama anahtarı %s zaten çapraz sertifikalı\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr ""
 "yardımcı anahtar %s imzalamıyor, dolayısıyla çapraz sertifikalı olması "
 "gerekmiyor\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "Lütfen sadece ve sadece bir kullanıcı kimlik seçiniz.\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "kullanıcı kimliği \"%s\" için v3 öz-imzası atlanıyor\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "Tercih ettiğiniz sunucunun adresini girin: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "Onu değiştirmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "Onu silmek istediğinizden emin misiniz? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "Simgelemi giriniz: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "Devam? (e/H ya da y/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "%d endeksine sahip kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "%s çittirmeli kullanıcı kimliği yok\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "%d indisli bir yardımcı anahtar yok\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "Kullanıcı kimliği: \"%s\"\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "%s anahtarınızla %s%s%s de imzalandı\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (dışarda geçersiz)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "Bu anahtarın geçerliliği %s de bitti.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "Onu yine de yürürlükten kaldırmak istiyor musunuz? (e/H veya y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr ""
 "Bu imza için bir yürürlükten kaldırma sertifikası oluşturulsun mu? (e/H veya "
 "y/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "Bu kullanıcı kimliklerini %s anahtarı üzerinde imzalamışsınız:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (yürülükten kaldırılmaz)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "%s tarafından %s de yürürlükten kaldırılmış\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "Bu imzaları yürürlükten kaldırmak üzeresiniz:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr ""
 "Bu yürürlükten kaldırma sertifikalarını gerçekten oluşturacak mısınız? (e/H "
 "veya y/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "gizli anahtar yok\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "kullanıcı kimliği \"%s\" zaten iptal edilmişti\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "UYARI: bir kullanıcı kimliği imzası %d saniye gelecekte oluşturuldu\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "Anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "Yardımcı anahtar %s zaten yürürlükten kaldırılmış.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr ""
@@ -5426,11 +5436,11 @@ msgstr ""
 msgid "can't handle public key algorithm %d\n"
 msgstr "%d genel anahtar algoritması kullanılamadı\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "UYARI: simetrik şifreli oturum anahtarı potansiyel olarak güvensiz\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d tipi alt paket kritik bit kümesine sahip\n"
@@ -5815,28 +5825,28 @@ msgstr "Bilginize: anahtar %s %s için bir tercihe sahip değil\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "veri kaydedilmedi; kaydetmek için \"--output\" seçeneğini kullanın\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "Bağımsız imza.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "Lütfen veri dosyasının ismini girin: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "standart girdiden okuyor ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "imzalı veri yok\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "imzalı veri '%s'  açılamadı\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "imzalı veri fd=%d açılamadı: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c8880d0fa..66d27c651 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 1.4.4\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:35+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2009-07-09 10:03+0200\n"
 "Last-Translator: Meng Jie <[email protected]>\n"
 "Language-Team: Chinese (simplified) <[email protected]>\n"
@@ -127,7 +127,7 @@ msgstr "无法建立‘%s’：%s\n"
 #: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
 #: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
 #: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
-#: g10/plaintext.c:503 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
 #: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
 #: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
 #: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
@@ -339,7 +339,7 @@ msgstr ""
 msgid "Please enter the new passphrase"
 msgstr "更改密码"
 
-#: agent/gpg-agent.c:118 agent/preset-passphrase.c:72 scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 #, fuzzy
 msgid ""
@@ -350,107 +350,107 @@ msgstr ""
 "选项：\n"
 " "
 
-#: agent/gpg-agent.c:120 scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr ""
 
-#: agent/gpg-agent.c:121 scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr ""
 
-#: agent/gpg-agent.c:122 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
 #: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
 #: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:123 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:124 scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:125 scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr ""
 
-#: agent/gpg-agent.c:126 scd/scdaemon.c:113 sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 #, fuzzy
 msgid "|FILE|read options from FILE"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:131 scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr ""
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr ""
 
-#: agent/gpg-agent.c:133 tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 #, fuzzy
 msgid "use a log file for the server"
 msgstr "在公钥服务器上搜寻密钥"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 #, fuzzy
 msgid "use a standard location for the socket"
 msgstr "为所选用户标识的设定注记"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr ""
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr ""
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 #, fuzzy
 msgid "do not use the SCdaemon"
 msgstr "导入后不更新信任度数据库"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr ""
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr ""
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr ""
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr ""
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr ""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 #, fuzzy
 msgid "allow presetting passphrase"
 msgstr "生成密码的时候发生错误：%s\n"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr ""
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr ""
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
 #: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
 #: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
 #: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
@@ -459,158 +459,158 @@ msgstr ""
 "请向 <@EMAIL@> 报告程序缺陷。\n"
 "请向 <[email protected]> 反映简体中文翻译的问题。\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 #, fuzzy
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法： gpg [选项] [文件] (用 -h 求助)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
 msgstr ""
 
-#: agent/gpg-agent.c:390 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr ""
 
-#: agent/gpg-agent.c:611 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
 #: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: tools/gpg-check-pattern.c:177
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr ""
 
-#: agent/gpg-agent.c:726 g10/gpg.c:2115 scd/scdaemon.c:511 sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:731 agent/gpg-agent.c:1333 g10/gpg.c:2119
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
 #: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "配置文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:739 g10/gpg.c:2126 scd/scdaemon.c:524 sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1102 g10/plaintext.c:140 g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446 agent/gpg-agent.c:1564 agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609 agent/gpg-agent.c:1613 g10/exec.c:188
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
 #: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1460 scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1483 scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, fuzzy, c-format
 msgid "can't create socket: %s\n"
 msgstr "无法建立‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 #, fuzzy
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:1521 scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 #, fuzzy
 msgid "error getting nonce for the socket\n"
 msgstr "获取新 PIN 时出错：%s\n"
 
-#: agent/gpg-agent.c:1526 scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, fuzzy, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "在‘%s’中寻找信任度记录时出错：%s\n"
 
-#: agent/gpg-agent.c:1538 scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, fuzzy, c-format
 msgid "listen() failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: agent/gpg-agent.c:1544 scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, fuzzy, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在将私钥写至`%s'\n"
 
-#: agent/gpg-agent.c:1572 agent/gpg-agent.c:1619 g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "已创建目录‘%s’\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, fuzzy, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "fstat(%d) 在 %s 中出错：%s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, fuzzy, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "无法建立目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1759 scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, fuzzy, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr ""
 
-#: agent/gpg-agent.c:1951 scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, fuzzy, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: agent/gpg-agent.c:2074 scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, fuzzy, c-format
 msgid "%s %s stopped\n"
 msgstr "%s：已跳过：%s\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 #, fuzzy
 msgid "no gpg-agent running in this session\n"
 msgstr "gpg-agent 在此次舍话中无法使用\n"
 
-#: agent/gpg-agent.c:2221 common/simple-pwquery.c:352 common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "GPG_AGENT_INFO 环境变量格式错误\n"
 
-#: agent/gpg-agent.c:2234 common/simple-pwquery.c:364 common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -818,7 +818,7 @@ msgstr "生成密码的时候发生错误：%s\n"
 msgid "can't fdopen pipe for reading: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, fuzzy, c-format
 msgid "error forking process: %s\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -833,7 +833,7 @@ msgstr ""
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: common/exechelp.c:825 common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, fuzzy, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -843,7 +843,7 @@ msgstr "读取‘%s’时出错：%s\n"
 msgid "error running `%s': probably not installed\n"
 msgstr ""
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, fuzzy, c-format
 msgid "error running `%s': terminated\n"
 msgstr "读取‘%s’时出错：%s\n"
@@ -955,11 +955,16 @@ msgstr ""
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/asshelp.c:208 tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr ""
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr ""
 
@@ -1211,46 +1216,46 @@ msgstr "与预期不符的 ASCII 封装："
 msgid "invalid dash escaped line: "
 msgstr "以连字符开头的行格式错误："
 
-#: g10/armor.c:809 g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "跳过无效的 64 进制字符 %02x\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "文件先于预期结束(没有 CRC 部分)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "文件先于预期结束(CRC 部分未结束)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "异常的 CRC\n"
 
-#: g10/armor.c:898 g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 错误：%06lx - %06lx\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "文件先于预期结束(于结尾处)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "结尾行有问题\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 数据。\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "无效的 ASCII 封装：一行超过 %d 字符\n"
 
-#: g10/armor.c:1242
+#: g10/armor.c:1243
 msgid ""
 "quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封装里出现括上的可打印字符――可能是有缺陷的信件传输程序造成的\n"
@@ -1292,7 +1297,7 @@ msgstr "OpenPGP 卡不可用：%s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡号 %s\n"
 
-#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1549
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
 #: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
@@ -1560,7 +1565,7 @@ msgstr "私钥已存储在卡上\n"
 msgid "error writing key to card: %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/card-util.c:1679 g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "离开这个菜单"
 
@@ -1568,7 +1573,7 @@ msgstr "离开这个菜单"
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:1682 g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "显示这份在线说明"
 
@@ -1640,7 +1645,7 @@ msgstr "允许使用管理员命令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "不允许使用管理员命令\n"
 
-#: g10/card-util.c:1985 g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的指令(尝试“help”)\n"
 
@@ -1648,18 +1653,18 @@ msgstr "无效的指令(尝试“help”)\n"
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:166 g10/gpg.c:4023 g10/keyring.c:387 g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514 g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
 #: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
@@ -1929,7 +1934,7 @@ msgstr "CA 指纹："
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "--allow-non-selfsigned-uid 使无效密钥 %s 生效\n"
 
-#: g10/getkey.c:2533 g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公钥 %s 没有相对应的私钥――忽略\n"
@@ -2170,7 +2175,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公钥："
 
-#: g10/gpg.c:860 g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "对称加密："
 
@@ -2178,7 +2183,7 @@ msgstr "对称加密："
 msgid "Hash: "
 msgstr "散列："
 
-#: g10/gpg.c:874 g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "压缩："
 
@@ -2316,395 +2321,395 @@ msgstr "注意：旧式的默认配置文件‘%s’已被忽略\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr ""
 
-#: g10/gpg.c:2350 g10/gpg.c:3041 g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "注意：一般情况下不会用到 %s！\n"
 
-#: g10/gpg.c:2534 g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:2651 g10/gpg.c:2846 g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 #, fuzzy
 msgid "show only the primary user ID in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名的有效性"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s：%d：无效的校验选项\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "无效的校验选项\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法把运行路径设成 %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s：%d：无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 清单\n"
 
-#: g10/gpg.c:3030 sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储！\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 会使得 %s 失效\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不可与 %s 并用\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用无意义！\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "您只有在 --pgp2 模式下才能做分离式或明文签名\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "您在 --pgp2 模式下时，不能同时签名和加密\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "启用 --pgp2 时您应该只使用文件，而非管道\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密报文需要 IDEA 算法\n"
 
-#: g10/gpg.c:3167 g10/gpg.c:3191 sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的对称加密算法无效\n"
 
-#: g10/gpg.c:3173 g10/gpg.c:3197 sm/gpgsm.c:1518 sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大验证深度一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认验证级别；一定要是 0，1，2 或 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小验证级别；一定要是 1，2 或 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式(0)\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "无效的默认首选项\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人对称加密算法首选项\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人散列算法首选项\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’对称加密算法\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’散列算法\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "您不能在 %s 模式下使用‘%s’压缩算法\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了收件人(-r)但并未使用公钥加密\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [文件名]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [文件名]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [文件名]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [文件名]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [文件名]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [文件名]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [文件名]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "使用 --symmetric --sign --encrypt 时不能使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [文件名]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [文件名]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [文件名]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 用户标识"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 用户标识 [指令]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 #, fuzzy
 msgid "--passwd <user-id>"
 msgstr "--sign-key 用户标识"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "上传至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "搜寻公钥服务器失败：%s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "从公钥服务器更新失败：%s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行 ASCII 封装失败：%s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "无效的‘%s’散列算法\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[文件名]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始键入您的报文……\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的验证策略 URL 无效\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
 
@@ -2856,266 +2861,271 @@ msgstr "      清除的签名：%lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr "  清除的用户标识：%lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, fuzzy, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告：密钥 %s 下列用户标识的首选项中包含不可用的算法：\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：对称加密算法 %s 对应首选项\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的首选项并重新分发这把密钥，\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的首选项：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729 g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥 %s：PKS 子钥破损已修复\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自身签名的用户标识“%s”\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自身签名所致\n"
 
-#: g10/import.c:791 g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥――已跳过\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:811 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/import.c:815 g10/import.c:910 g10/import.c:1177 g10/import.c:1322
-#: g10/import.c:2431 g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "写入钥匙环‘%s’时出错： %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥“%s”已导入\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不吻合\n"
 
-#: g10/import.c:875 g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:883 g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块： %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s”一个新的用户标识\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s”%d 个新的用户标识\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s”1 个新的签名\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s”%d 个新的签名\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s”1 个新的子钥\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s”%d 个新的子钥\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s”%d 个用户标识被清除\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s”未改变\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的加密算法 %d――已跳过\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "不允许导入私钥\n"
 
-#: g10/import.c:1171 g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "没有默认的私钥钥匙环： %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "密钥 %s：已在私钥钥匙环中\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "密钥 %s：找不到私钥：%s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥――无法应用吊销证书\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已拒绝\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s”吊销证书已被导入\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”使用了不支持的公钥算法\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识“%s”自身签名无效\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "密钥 %s：没有可供绑定的子钥\n"
-
-#: g10/import.c:1444 g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "密钥 %s：已新增直接密钥签名\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "密钥 %s：没有可供绑定的子钥\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子钥绑定\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子钥绑定\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销的子钥\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子钥吊销\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子钥吊销\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识“%s”\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子钥\n"
@@ -3124,65 +3134,65 @@ msgstr "密钥 %s：已跳过子钥\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：不可导出的签名(验证级别 0x%02X)――已跳过\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误――已跳过\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名验证级别(0x%02X)――已跳过\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识――已合并\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销密钥 %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销密钥 %s 不存在。\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已新增吊销证书“%s”\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已新增直接密钥签名\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "注意：密钥的序列号与卡的不符\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "注意：主钥在线，存储在卡上\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "注意：子钥在线，存储在卡上\n"
 
@@ -3290,12 +3300,12 @@ msgid "User ID \"%s\" is revoked."
 msgstr "用户标识“%s”已被吊销。"
 
 #: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
-#: g10/keyedit.c:895 g10/keyedit.c:1783
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "您仍然想要为它签名吗？(y/N)"
 
 #: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  无法添加签名。\n"
 
@@ -3473,8 +3483,8 @@ msgstr "我非常小心地检查过这把密钥。\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要签名吗？(y/N)"
 
-#: g10/keyedit.c:1066 g10/keyedit.c:4965 g10/keyedit.c:5056 g10/keyedit.c:5120
-#: g10/keyedit.c:5181 g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -3528,180 +3538,180 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "您真的想要这么做吗？(y/N)"
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把密钥的签名移动到正确的位置去\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "保存并离开"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "显示密钥指纹"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "列出密钥和用户标识"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "选择用户标识 N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "选择子钥 N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "检查签名"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "为所选用户标识添加签名[* 参见下面的相关命令]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "为所选用户标识添加本地签名"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "为所选用户标识添加信任签名"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "为所选用户标识添加不可吊销签名"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "增加一个用户标识"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "增加一个照片标识"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "删除选定的用户标识"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "添加一个子钥"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "在智能卡上添加一把密钥"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "将一把密钥移动到智能卡上"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "将备份密钥转移到卡上"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "删除选定的子钥"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "增加一把吊销密钥"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "删除所选用户标识上的签名"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "变更密钥或所选子钥的使用期限"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "将所选的用户标识设为首选用户标识"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "在私钥和公钥清单间切换"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "列出首选项(专家模式)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "列出首选项(详细模式)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "设定所选用户标识的首选项"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "设定所选用户标识的首选公钥服务器的 URL"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "为所选用户标识的设定注记"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "更改密码"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "更改信任度"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "吊销所选用户标识上的签名"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "吊销选定的用户标识"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "吊销密钥或选定的子钥"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "启用密钥"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "禁用密钥"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "显示选定的照片标识"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "压缩不可用的用户标识并删除不可用的签名"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "压缩不可用的用户标识并删除所有签名"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "读取私钥区块“%s”时出错：%s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "私钥可用。\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "要有私钥才能这么做。\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "请先使用“toggle”指令。\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
 "* The `sign' command may be prefixed with an `l' for local signatures "
 "(lsign),\n"
@@ -3712,247 +3722,247 @@ msgstr ""
 "  信任签名，或‘nr’前缀(nrsign)以添加不可吊销签名，或者以上三种前缀的任何组\n"
 "  合(ltsign、tnrsign 等)。\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "密钥已被吊销。"
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的为所有的用户标识签名吗？(y/N)"
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示：选择要添加签名的用户标识\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的签名类型‘%s’\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允许使用这个指令。\n"
 
-#: g10/keyedit.c:1857 g10/keyedit.c:1877 g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "您至少得选择一个用户标识。\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "您不能删除最后一个用户标识！\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要删除所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要删除这个用户标识吗？(y/N)"
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 #, fuzzy
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要删除主钥吗？(y/N)"
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "您必须指定一把密钥。\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "命令需要一个文件名作为参数\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "无法打开‘%s’：%s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "从‘%s’读取备份密钥时出错：%s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "您必须选择至少一把密钥。\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "您真的想要删除选定的密钥吗？(y/N)"
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "您真的要删除这把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要吊销所有选定的用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要吊销这个用户标识吗？(y/N)"
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "您真的要吊销整把密钥吗？(y/N)"
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "您真的要吊销选定的子钥吗？(y/N)"
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "您真的要吊销这把子钥吗？(y/N)"
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "使用用户提供的信任度数据库时信任度可能并未被设定\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "设为首选项列表为：\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所选用户标识的首选项吗？(y/N)"
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新首选项吗？(y/N)"
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "要保存变动吗？(y/N)"
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而离开吗？(y/N)"
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失败：%s\n"
 
-#: g10/keyedit.c:2271 g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私钥失败：%s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "密钥没有变动所以不需要更新。\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "散列："
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "特点："
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "公钥服务器不可变造"
 
-#: g10/keyedit.c:2522 g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "首选公钥服务器："
 
-#: g10/keyedit.c:2530 g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "注记："
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 样式的用户标识没有首选项。\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "此密钥已于 %s 被 %s 密钥 %s 所吊销\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "这把密钥可被 %s 密钥 %s 吊销"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr " (敏感的)"
 
-#: g10/keyedit.c:2854 g10/keyedit.c:2910 g10/keyedit.c:2971 g10/keyedit.c:2986
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
 #: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:2857 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "已吊销：%s"
 
-#: g10/keyedit.c:2859 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "已过期：%s"
 
-#: g10/keyedit.c:2861 g10/keyedit.c:2912 g10/keyedit.c:2973 g10/keyedit.c:2988
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
 #: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
 #: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "有效至：%s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "可用于：%s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "信任度：%s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "有效性：%s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "这把密钥已经被禁用"
 
-#: g10/keyedit.c:2917 g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "卡号："
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
 msgstr "请注意，在您重启程序之前，显示的密钥有效性未必正确，\n"
 
-#: g10/keyedit.c:3005 g10/keyedit.c:3351 g10/keyserver.c:542
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
 #: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "已吊销"
 
-#: g10/keyedit.c:3007 g10/keyedit.c:3353 g10/keyserver.c:546
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
 #: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "已过期"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
 msgstr ""
 "警告：没有首选用户标识。此指令可能假定一个不同的用户标识为首选用户标识。\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
 "WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
 "versions\n"
@@ -3961,74 +3971,74 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加照片标识可能会导致某些版本的 PGP 不能识别这把密钥。\n"
 
-#: g10/keyedit.c:3138 g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "您确定仍然想要增加吗？(y/N)"
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "删除这个完好的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "删除这个无效的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "删除这个未知的签名吗？(y/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要删除这个自身签名吗？(y/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已经删除了 %d 个签名。\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "没有东西被删除。\n"
 
-#: g10/keyedit.c:3355 g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "无效"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, fuzzy, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, fuzzy, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "密钥 %s：“%s”%d 个签名被清除\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, fuzzy, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "用户标识“%s”：无用部分已清除\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
 "WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
 "cause\n"
@@ -4037,197 +4047,197 @@ msgstr ""
 "警告：这是一把 PGP2 样式的密钥。\n"
 "      增加指定吊销者可能会导致某些版本的 PGP 无法识别这把密钥。\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "您不可以为 PGP 2.x 样式的密钥添加指定吊销者。\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "输入指定吊销者的用户标识："
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "无法将 PGP 2.x 样式的密钥设为指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "您不能将某把密钥设为它自己的指定吊销者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "这把密钥已被指定为一个吊销者\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告：将某把密钥指派为指定吊销者的操作无法撤销！\n"
 
-#: g10/keyedit.c:3586
+#: g10/keyedit.c:3587
 msgid ""
 "Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "您确定要将这把密钥设为指定吊销者吗？(y/N)："
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "请从私钥中删除选择。\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "请至多选择一个子钥。\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "将要变更子钥的使用期限。\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "将要变更主钥的使用期限。\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "您不能变更 v3 密钥的使用期限\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私钥环里没有相应的签名\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "签名的子钥 %s 已经交叉验证\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子钥 %s 不签名，因此不需要交叉验证\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "请精确地选择一个用户标识。\n"
 
-#: g10/keyedit.c:4008 g10/keyedit.c:4118 g10/keyedit.c:4238 g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "跳过用户标识“%s”的 v3 自身签名\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "输入您首选的公钥服务器的 URL："
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "您确定要替换它吗？(y/N)"
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "您确定要删除它吗？(y/N)"
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "输入注记："
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "继续？(y/N)"
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "没有索引为 %d 的用户标识\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "没有散列值为 %s 的用户标识\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "没有索引为 %d 的子钥\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "用户标识：“%s”\n"
 
-#: g10/keyedit.c:4777 g10/keyedit.c:4871 g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "由您的密钥 %s 于 %s%s%s 签名\n"
 
-#: g10/keyedit.c:4779 g10/keyedit.c:4873 g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (不可导出)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "这份签名已在 %s 过期。\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "您确定您仍然想要吊销它吗？(y/N)"
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要为这份签名生成一份吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr ""
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "您已经为这些密钥 %s 上的这些用户标识添加签名：\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (不可吊销)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "由您的密钥 %s 于 %s 吊销\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "您正在吊销这些签名：\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要生成吊销证书吗？(y/N)"
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "没有私钥\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "用户标识“%s”已经被吊销。\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告：有一份用户标识签名的日期标记为 %d 秒后的未来\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "密钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子钥 %s 已被吊销。\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 照片标识(大小为 %ld，属于密钥 %s，用户标识 %d)\n"
@@ -5347,11 +5357,11 @@ msgstr "警告：在‘%s’里的选项于此次运行期间未被使用\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "无法操作公钥算法 %d\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类别的子包设定了关键位\n"
@@ -5720,28 +5730,28 @@ msgstr "密钥 %s：没有有效的用户标识\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "数据未被保存；请用“--output”选项来保存它们\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "分离的签名。\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "请输入数据文件的名称： "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "正在从标准输入读取 ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "不含签名的数据\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "无法打开有签名的数据‘%s’\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, fuzzy, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "无法打开有签名的数据‘%s’\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 917f8b57f..9067301fb 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnupg 2.0.15\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2010-03-09 09:41+0100\n"
+"POT-Creation-Date: 2010-07-19 08:57+0200\n"
 "PO-Revision-Date: 2010-03-10 13:02+0800\n"
 "Last-Translator: Jedi <[email protected]>\n"
 "Language-Team: Chinese (traditional) <[email protected]>\n"
@@ -62,11 +62,15 @@ msgstr ""
 "關於此規範的細節, 請洽你的系統管理者."
 
 #: agent/call-pinentry.c:715
-msgid "Please enter your PIN, so that the secret key can be unlocked for this session"
+msgid ""
+"Please enter your PIN, so that the secret key can be unlocked for this "
+"session"
 msgstr "請輸入你的個人識別碼 (PIN) 以便在此階段作業中解開密鑰"
 
 #: agent/call-pinentry.c:718
-msgid "Please enter your passphrase, so that the secret key can be unlocked for this session"
+msgid ""
+"Please enter your passphrase, so that the secret key can be unlocked for "
+"this session"
 msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 
 #: agent/call-pinentry.c:775
@@ -74,8 +78,7 @@ msgstr "請輸入你的密語以便在此階段作業中解開私鑰"
 msgid "SETERROR %s (try %d of %d)"
 msgstr "設定錯誤 %s (第 %d 次嘗試, 最多 %d 次)"
 
-#: agent/call-pinentry.c:795
-#: agent/call-pinentry.c:807
+#: agent/call-pinentry.c:795 agent/call-pinentry.c:807
 msgid "PIN too long"
 msgstr "個人識別碼 (PIN) 太長"
 
@@ -108,60 +111,27 @@ msgstr "密語"
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "未支援大於 %d 位元的 ssh 金鑰\n"
 
-#: agent/command-ssh.c:688
-#: g10/card-util.c:830
-#: g10/exec.c:473
-#: g10/gpg.c:1122
-#: g10/keygen.c:3394
-#: g10/keygen.c:3427
-#: g10/keyring.c:1237
-#: g10/keyring.c:1569
-#: g10/openfile.c:275
-#: g10/openfile.c:368
-#: g10/sign.c:801
-#: g10/sign.c:1110
-#: g10/tdbio.c:548
-#: jnlib/dotlock.c:310
+#: agent/command-ssh.c:688 g10/card-util.c:830 g10/exec.c:473 g10/gpg.c:1122
+#: g10/keygen.c:3394 g10/keygen.c:3427 g10/keyring.c:1237 g10/keyring.c:1569
+#: g10/openfile.c:275 g10/openfile.c:368 g10/sign.c:801 g10/sign.c:1110
+#: g10/tdbio.c:548 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:784
-#: g10/dearmor.c:60
-#: g10/dearmor.c:107
-#: g10/decrypt.c:70
-#: g10/encode.c:194
-#: g10/encode.c:504
-#: g10/gpg.c:1123
-#: g10/import.c:193
-#: g10/keygen.c:2877
-#: g10/keyring.c:1595
-#: g10/openfile.c:192
-#: g10/openfile.c:353
-#: g10/plaintext.c:503
-#: g10/sign.c:783
-#: g10/sign.c:978
-#: g10/sign.c:1094
-#: g10/sign.c:1250
-#: g10/tdbdump.c:142
-#: g10/tdbdump.c:150
-#: g10/tdbio.c:552
-#: g10/tdbio.c:616
-#: g10/verify.c:99
-#: g10/verify.c:162
-#: sm/gpgsm.c:2047
-#: sm/gpgsm.c:2077
-#: sm/gpgsm.c:2115
-#: sm/gpgsm.c:2153
-#: sm/qualified.c:66
+#: agent/command-ssh.c:700 common/helpfile.c:47 g10/card-util.c:784
+#: g10/dearmor.c:60 g10/dearmor.c:107 g10/decrypt.c:70 g10/encode.c:194
+#: g10/encode.c:504 g10/gpg.c:1123 g10/import.c:193 g10/keygen.c:2877
+#: g10/keyring.c:1595 g10/openfile.c:192 g10/openfile.c:353
+#: g10/plaintext.c:511 g10/sign.c:783 g10/sign.c:978 g10/sign.c:1094
+#: g10/sign.c:1250 g10/tdbdump.c:142 g10/tdbdump.c:150 g10/tdbio.c:552
+#: g10/tdbio.c:616 g10/verify.c:99 g10/verify.c:162 sm/gpgsm.c:2047
+#: sm/gpgsm.c:2077 sm/gpgsm.c:2115 sm/gpgsm.c:2153 sm/qualified.c:66
 #, c-format
 msgid "can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: agent/command-ssh.c:1653
-#: agent/command-ssh.c:1671
+#: agent/command-ssh.c:1653 agent/command-ssh.c:1671
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "取得此卡片序號時出錯: %s\n"
@@ -196,20 +166,18 @@ msgstr "寫入金鑰時出錯: %s\n"
 msgid "Please enter the passphrase for the ssh key%0A  %c"
 msgstr "請輸入此 ssh 金鑰的密語%0A  %c"
 
-#: agent/command-ssh.c:2383
-#: agent/genkey.c:310
-#: agent/genkey.c:432
+#: agent/command-ssh.c:2383 agent/genkey.c:310 agent/genkey.c:432
 msgid "Please re-enter this passphrase"
 msgstr "請再次輸入密語"
 
 #: agent/command-ssh.c:2404
 #, c-format
-msgid "Please enter a passphrase to protect the received secret key%%0A   %s%%0Awithin gpg-agent's key storage"
+msgid ""
+"Please enter a passphrase to protect the received secret key%%0A   %s%%"
+"0Awithin gpg-agent's key storage"
 msgstr "請輸入密語以保護收到的私鑰%%0A   %s%%0A於 gpg-agent 的金鑰存放處"
 
-#: agent/command-ssh.c:2442
-#: agent/genkey.c:340
-#: agent/genkey.c:463
+#: agent/command-ssh.c:2442 agent/genkey.c:340 agent/genkey.c:463
 #: tools/symcryptrun.c:433
 msgid "does not match - try again"
 msgstr "前後不一致 - 請再試一次"
@@ -219,13 +187,11 @@ msgstr "前後不一致 - 請再試一次"
 msgid "failed to create stream from socket: %s\n"
 msgstr "從 socket 建立串流失敗: %s\n"
 
-#: agent/divert-scd.c:92
-#: g10/call-agent.c:863
+#: agent/divert-scd.c:92 g10/call-agent.c:863
 msgid "Please insert the card with serial number"
 msgstr "請插入下列序號的卡片:"
 
-#: agent/divert-scd.c:93
-#: g10/call-agent.c:864
+#: agent/divert-scd.c:93 g10/call-agent.c:864
 msgid "Please remove the current card and insert the one with serial number"
 msgstr "請移除現用中的卡片並插入下列序號的卡片:"
 
@@ -277,25 +243,18 @@ 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:384
-#: sm/export.c:638
-#: sm/export.c:654
-#: sm/import.c:661
-#: sm/import.c:686
+#: agent/genkey.c:108 sm/certreqgen-ui.c:384 sm/export.c:638 sm/export.c:654
+#: sm/import.c:661 sm/import.c:686
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "建立暫存檔時出錯: %s\n"
 
-#: agent/genkey.c:115
-#: sm/export.c:645
-#: sm/import.c:669
+#: agent/genkey.c:115 sm/export.c:645 sm/import.c:669
 #, c-format
 msgid "error writing to temporary file: %s\n"
 msgstr "寫入暫存檔時出錯: %s\n"
 
-#: agent/genkey.c:153
-#: agent/genkey.c:159
+#: agent/genkey.c:153 agent/genkey.c:159
 msgid "Enter new passphrase"
 msgstr "請輸入新密語"
 
@@ -305,30 +264,48 @@ msgstr "無論如何還是要用這個"
 
 #: agent/genkey.c:193
 #, c-format
-msgid "Warning: You have entered an insecure passphrase.%%0AA passphrase should be at least %u character long."
-msgid_plural "Warning: You have entered an insecure passphrase.%%0AA passphrase should be at least %u characters long."
+msgid ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u character long."
+msgid_plural ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should be "
+"at least %u characters long."
 msgstr[0] "警告: 你輸入了不安全的密語.%%0A密語至少得要有 %u 個字符長."
 
 #: agent/genkey.c:214
 #, c-format
-msgid "Warning: You have entered an insecure passphrase.%%0AA passphrase should contain at least %u digit or%%0Aspecial character."
-msgid_plural "Warning: You have entered an insecure passphrase.%%0AA passphrase should contain at least %u digits or%%0Aspecial characters."
-msgstr[0] "警告: 你輸入了不安全的密語.%%0A密語至少得要含有 %u 個數字或特別字符."
+msgid ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digit or%%0Aspecial character."
+msgid_plural ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase should "
+"contain at least %u digits or%%0Aspecial characters."
+msgstr[0] ""
+"警告: 你輸入了不安全的密語.%%0A密語至少得要含有 %u 個數字或特別字符."
 
 #: agent/genkey.c:237
 #, c-format
-msgid "Warning: You have entered an insecure passphrase.%%0AA passphrase may not be a known term or match%%0Acertain pattern."
-msgstr "警告: 你輸入了不安全的密語.%%0A密語不得含有已知的詞彙, 亦不得與確知的樣式吻合."
+msgid ""
+"Warning: You have entered an insecure passphrase.%%0AA passphrase may not be "
+"a known term or match%%0Acertain pattern."
+msgstr ""
+"警告: 你輸入了不安全的密語.%%0A密語不得含有已知的詞彙, 亦不得與確知的樣式吻"
+"合."
 
 #: agent/genkey.c:253
 #, c-format
-msgid "You have not entered a passphrase!%0AAn empty passphrase is not allowed."
+msgid ""
+"You have not entered a passphrase!%0AAn empty passphrase is not allowed."
 msgstr "你還沒有輸入密語!%0A空密語是不行的."
 
 #: agent/genkey.c:255
 #, c-format
-msgid "You have not entered a passphrase - this is in general a bad idea!%0APlease confirm that you do not want to have any protection on your key."
-msgstr "你還沒有輸入密語 - 通常這可不是個好主意!%0A請確認你不想要對你的金鑰做任何保護."
+msgid ""
+"You have not entered a passphrase - this is in general a bad idea!%0APlease "
+"confirm that you do not want to have any protection on your key."
+msgstr ""
+"你還沒有輸入密語 - 通常這可不是個好主意!%0A請確認你不想要對你的金鑰做任何保"
+"護."
 
 #: agent/genkey.c:264
 msgid "Yes, protection is not needed"
@@ -343,9 +320,7 @@ msgstr "請輸入密語至%0A以保護你的新金鑰"
 msgid "Please enter the new passphrase"
 msgstr "請輸入新的密語"
 
-#: agent/gpg-agent.c:118
-#: agent/preset-passphrase.c:72
-#: scd/scdaemon.c:103
+#: agent/gpg-agent.c:120 agent/preset-passphrase.c:72 scd/scdaemon.c:103
 #: tools/gpg-check-pattern.c:70
 msgid ""
 "@Options:\n"
@@ -354,138 +329,113 @@ msgstr ""
 "@選項:\n"
 " "
 
-#: agent/gpg-agent.c:120
-#: scd/scdaemon.c:105
+#: agent/gpg-agent.c:122 scd/scdaemon.c:105
 msgid "run in server mode (foreground)"
 msgstr "以伺服器模式執行 (前景)"
 
-#: agent/gpg-agent.c:121
-#: scd/scdaemon.c:108
+#: agent/gpg-agent.c:123 scd/scdaemon.c:108
 msgid "run in daemon mode (background)"
 msgstr "以服務模式執行 (背景)"
 
-#: agent/gpg-agent.c:122
-#: g10/gpg.c:488
-#: g10/gpgv.c:71
-#: kbx/kbxutil.c:88
-#: scd/scdaemon.c:109
-#: sm/gpgsm.c:281
-#: tools/gpg-connect-agent.c:69
-#: tools/gpgconf.c:80
-#: tools/symcryptrun.c:163
+#: agent/gpg-agent.c:124 g10/gpg.c:488 g10/gpgv.c:71 kbx/kbxutil.c:88
+#: scd/scdaemon.c:109 sm/gpgsm.c:281 tools/gpg-connect-agent.c:69
+#: tools/gpgconf.c:80 tools/symcryptrun.c:163
 msgid "verbose"
 msgstr "囉唆模式"
 
-#: agent/gpg-agent.c:123
-#: g10/gpgv.c:72
-#: kbx/kbxutil.c:89
-#: scd/scdaemon.c:110
+#: agent/gpg-agent.c:125 g10/gpgv.c:72 kbx/kbxutil.c:89 scd/scdaemon.c:110
 #: sm/gpgsm.c:282
 msgid "be somewhat more quiet"
 msgstr "盡量安靜些"
 
-#: agent/gpg-agent.c:124
-#: scd/scdaemon.c:111
+#: agent/gpg-agent.c:126 scd/scdaemon.c:111
 msgid "sh-style command output"
 msgstr "sh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:125
-#: scd/scdaemon.c:112
+#: agent/gpg-agent.c:127 scd/scdaemon.c:112
 msgid "csh-style command output"
 msgstr "csh 樣式的指令輸出"
 
-#: agent/gpg-agent.c:126
-#: scd/scdaemon.c:113
-#: sm/gpgsm.c:312
+#: agent/gpg-agent.c:128 scd/scdaemon.c:113 sm/gpgsm.c:312
 #: tools/symcryptrun.c:166
 msgid "|FILE|read options from FILE"
 msgstr "|檔案|從「檔案」中讀取選項"
 
-#: agent/gpg-agent.c:131
-#: scd/scdaemon.c:123
+#: agent/gpg-agent.c:133 scd/scdaemon.c:123
 msgid "do not detach from the console"
 msgstr "不要從 console 分離"
 
-#: agent/gpg-agent.c:132
+#: agent/gpg-agent.c:134
 msgid "do not grab keyboard and mouse"
 msgstr "不要奪取鍵盤及滑鼠"
 
-#: agent/gpg-agent.c:133
-#: tools/symcryptrun.c:165
+#: agent/gpg-agent.c:135 tools/symcryptrun.c:165
 msgid "use a log file for the server"
 msgstr "為伺服器使用日誌檔"
 
-#: agent/gpg-agent.c:135
+#: agent/gpg-agent.c:137
 msgid "use a standard location for the socket"
 msgstr "為 socket 使用標準的位置"
 
-#: agent/gpg-agent.c:138
+#: agent/gpg-agent.c:140
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 做為 PIN-Entry 程式"
 
-#: agent/gpg-agent.c:141
+#: agent/gpg-agent.c:143
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 做為 SCdaemon 程式"
 
-#: agent/gpg-agent.c:142
+#: agent/gpg-agent.c:144
 msgid "do not use the SCdaemon"
 msgstr "不要使用 SCdaemon"
 
-#: agent/gpg-agent.c:154
+#: agent/gpg-agent.c:156
 msgid "ignore requests to change the TTY"
 msgstr "忽略變更 TTY 的要求"
 
-#: agent/gpg-agent.c:156
+#: agent/gpg-agent.c:158
 msgid "ignore requests to change the X display"
 msgstr "忽略變更 X display 的要求"
 
-#: agent/gpg-agent.c:159
+#: agent/gpg-agent.c:161
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|讓快取住的個人識別碼 (PIN) 在 N 秒後到期"
 
-#: agent/gpg-agent.c:172
+#: agent/gpg-agent.c:174
 msgid "do not use the PIN cache when signing"
 msgstr "簽署時不要使用個人識別碼 (PIN) 快取"
 
-#: agent/gpg-agent.c:174
+#: agent/gpg-agent.c:176
 msgid "allow clients to mark keys as \"trusted\""
 msgstr "允許用戶端將金鑰標記為 \"已信任\""
 
-#: agent/gpg-agent.c:176
+#: agent/gpg-agent.c:178
 msgid "allow presetting passphrase"
 msgstr "允許預先設定密語"
 
-#: agent/gpg-agent.c:177
+#: agent/gpg-agent.c:179
 msgid "enable ssh-agent emulation"
 msgstr "啟用 ssh-agent 模擬"
 
-#: agent/gpg-agent.c:179
+#: agent/gpg-agent.c:181
 msgid "|FILE|write environment settings also to FILE"
 msgstr "|檔案|將環境設定也寫至「檔案」"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:333
-#: agent/preset-passphrase.c:94
-#: agent/protect-tool.c:163
-#: g10/gpg.c:814
-#: g10/gpgv.c:114
-#: kbx/kbxutil.c:113
-#: scd/scdaemon.c:246
-#: sm/gpgsm.c:519
-#: tools/gpg-connect-agent.c:181
-#: tools/gpgconf.c:102
-#: tools/symcryptrun.c:203
-#: tools/gpg-check-pattern.c:141
+#: agent/gpg-agent.c:332 agent/preset-passphrase.c:94 agent/protect-tool.c:163
+#: g10/gpg.c:814 g10/gpgv.c:114 kbx/kbxutil.c:113 scd/scdaemon.c:246
+#: sm/gpgsm.c:519 tools/gpg-connect-agent.c:181 tools/gpgconf.c:102
+#: tools/symcryptrun.c:203 tools/gpg-check-pattern.c:141
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr "翻譯瑕疵請回報給 <[email protected]>, 程式瑕疵則請回報給 <@EMAIL@>.\n"
 
-#: agent/gpg-agent.c:342
+#: agent/gpg-agent.c:341
 msgid "Usage: gpg-agent [options] (-h for help)"
 msgstr "用法: gpg-agent [選項] (或用 -h 求助)"
 
-#: agent/gpg-agent.c:344
+#: agent/gpg-agent.c:343
 msgid ""
 "Syntax: gpg-agent [options] [command [args]]\n"
 "Secret key management for GnuPG\n"
@@ -493,184 +443,144 @@ msgstr ""
 "語法: gpg-agent [選項] [指令 [引數]]\n"
 "GnuPG 私鑰管理\n"
 
-#: agent/gpg-agent.c:390
-#: g10/gpg.c:1007
-#: scd/scdaemon.c:318
-#: sm/gpgsm.c:669
+#: agent/gpg-agent.c:389 g10/gpg.c:1007 scd/scdaemon.c:318 sm/gpgsm.c:669
 #, c-format
 msgid "invalid debug-level `%s' given\n"
 msgstr "給定的除錯等級 `%s' 無效\n"
 
-#: agent/gpg-agent.c:611
-#: agent/protect-tool.c:1033
-#: kbx/kbxutil.c:428
-#: scd/scdaemon.c:425
-#: sm/gpgsm.c:912
-#: sm/gpgsm.c:915
-#: tools/symcryptrun.c:995
+#: agent/gpg-agent.c:610 agent/protect-tool.c:1033 kbx/kbxutil.c:428
+#: scd/scdaemon.c:425 sm/gpgsm.c:912 sm/gpgsm.c:915 tools/symcryptrun.c:995
 #: 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:726
-#: g10/gpg.c:2115
-#: scd/scdaemon.c:511
-#: sm/gpgsm.c:1011
+#: agent/gpg-agent.c:725 g10/gpg.c:2111 scd/scdaemon.c:511 sm/gpgsm.c:1011
 #, c-format
 msgid "NOTE: no default option file `%s'\n"
 msgstr "請注意: 沒有預設選項檔 `%s'\n"
 
-#: agent/gpg-agent.c:731
-#: agent/gpg-agent.c:1333
-#: g10/gpg.c:2119
-#: scd/scdaemon.c:516
-#: sm/gpgsm.c:1015
-#: tools/symcryptrun.c:928
+#: agent/gpg-agent.c:730 agent/gpg-agent.c:1335 g10/gpg.c:2115
+#: scd/scdaemon.c:516 sm/gpgsm.c:1015 tools/symcryptrun.c:928
 #, c-format
 msgid "option file `%s': %s\n"
 msgstr "選項檔 `%s': %s\n"
 
-#: agent/gpg-agent.c:739
-#: g10/gpg.c:2126
-#: scd/scdaemon.c:524
-#: sm/gpgsm.c:1022
+#: agent/gpg-agent.c:738 g10/gpg.c:2122 scd/scdaemon.c:524 sm/gpgsm.c:1022
 #, c-format
 msgid "reading options from `%s'\n"
 msgstr "從 `%s' 讀取選項中\n"
 
-#: agent/gpg-agent.c:1102
-#: g10/plaintext.c:140
-#: g10/plaintext.c:145
+#: agent/gpg-agent.c:1104 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:1446
-#: agent/gpg-agent.c:1564
-#: agent/gpg-agent.c:1568
-#: agent/gpg-agent.c:1609
-#: agent/gpg-agent.c:1613
-#: g10/exec.c:188
-#: g10/openfile.c:429
-#: scd/scdaemon.c:1021
+#: agent/gpg-agent.c:1448 agent/gpg-agent.c:1566 agent/gpg-agent.c:1570
+#: agent/gpg-agent.c:1611 agent/gpg-agent.c:1615 g10/exec.c:188
+#: g10/openfile.c:429 scd/scdaemon.c:1021
 #, c-format
 msgid "can't create directory `%s': %s\n"
 msgstr "無法建立目錄 `%s': %s\n"
 
-#: agent/gpg-agent.c:1460
-#: scd/scdaemon.c:1035
+#: agent/gpg-agent.c:1462 scd/scdaemon.c:1035
 msgid "name of socket too long\n"
 msgstr "socket 名稱太長\n"
 
-#: agent/gpg-agent.c:1483
-#: scd/scdaemon.c:1058
+#: agent/gpg-agent.c:1485 scd/scdaemon.c:1058
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "無法建立 socket: %s\n"
 
-#: agent/gpg-agent.c:1492
+#: agent/gpg-agent.c:1494
 #, c-format
 msgid "socket name `%s' is too long\n"
 msgstr "socket 名稱 `%s' 太長\n"
 
-#: agent/gpg-agent.c:1510
+#: agent/gpg-agent.c:1512
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "已經有一份 gpg-agent 在執行了 - 不會再啟動一份新的\n"
 
-#: agent/gpg-agent.c:1521
-#: scd/scdaemon.c:1077
+#: agent/gpg-agent.c:1523 scd/scdaemon.c:1077
 msgid "error getting nonce for the socket\n"
 msgstr "為 socket 取得 nonce 時出錯\n"
 
-#: agent/gpg-agent.c:1526
-#: scd/scdaemon.c:1080
+#: agent/gpg-agent.c:1528 scd/scdaemon.c:1080
 #, c-format
 msgid "error binding socket to `%s': %s\n"
 msgstr "綁定 socket 至 `%s' 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1538
-#: scd/scdaemon.c:1089
+#: agent/gpg-agent.c:1540 scd/scdaemon.c:1089
 #, c-format
 msgid "listen() failed: %s\n"
 msgstr "listen() 失敗: %s\n"
 
-#: agent/gpg-agent.c:1544
-#: scd/scdaemon.c:1096
+#: agent/gpg-agent.c:1546 scd/scdaemon.c:1096
 #, c-format
 msgid "listening on socket `%s'\n"
 msgstr "正在候聽 socket `%s'\n"
 
-#: agent/gpg-agent.c:1572
-#: agent/gpg-agent.c:1619
-#: g10/openfile.c:432
+#: agent/gpg-agent.c:1574 agent/gpg-agent.c:1621 g10/openfile.c:432
 #, c-format
 msgid "directory `%s' created\n"
 msgstr "`%s' 目錄已建立\n"
 
-#: agent/gpg-agent.c:1625
+#: agent/gpg-agent.c:1627
 #, c-format
 msgid "stat() failed for `%s': %s\n"
 msgstr "stat() 失敗於 `%s': %s\n"
 
-#: agent/gpg-agent.c:1629
+#: agent/gpg-agent.c:1631
 #, c-format
 msgid "can't use `%s' as home directory\n"
 msgstr "無法使用 `%s' 做為家目錄\n"
 
-#: agent/gpg-agent.c:1759
-#: scd/scdaemon.c:1112
+#: agent/gpg-agent.c:1764 scd/scdaemon.c:1112
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "於 fd %d 讀取 nonce 時出錯: %s\n"
 
-#: agent/gpg-agent.c:1781
+#: agent/gpg-agent.c:1786
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1786
+#: agent/gpg-agent.c:1791
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1806
+#: agent/gpg-agent.c:1811
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已啟動\n"
 
-#: agent/gpg-agent.c:1811
+#: agent/gpg-agent.c:1816
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 經手程式 0x%lx (用於 fd %d) 已終止\n"
 
-#: agent/gpg-agent.c:1951
-#: scd/scdaemon.c:1249
+#: agent/gpg-agent.c:1956 scd/scdaemon.c:1249
 #, c-format
 msgid "pth_select failed: %s - waiting 1s\n"
 msgstr "pth_select 失敗: %s - 等 1 秒鐘\n"
 
-#: agent/gpg-agent.c:2074
-#: scd/scdaemon.c:1316
+#: agent/gpg-agent.c:2079 scd/scdaemon.c:1316
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:2210
+#: agent/gpg-agent.c:2215
 msgid "no gpg-agent running in this session\n"
 msgstr "在此階段中沒有執行中的 gpg-agent\n"
 
-#: agent/gpg-agent.c:2221
-#: common/simple-pwquery.c:352
-#: common/asshelp.c:291
+#: agent/gpg-agent.c:2226 common/simple-pwquery.c:352 common/asshelp.c:403
 #: tools/gpg-connect-agent.c:2168
 msgid "malformed GPG_AGENT_INFO environment variable\n"
 msgstr "被變造的 GPG_AGENT_INFO 環境變數\n"
 
-#: agent/gpg-agent.c:2234
-#: common/simple-pwquery.c:364
-#: common/asshelp.c:303
+#: agent/gpg-agent.c:2239 common/simple-pwquery.c:364 common/asshelp.c:415
 #: tools/gpg-connect-agent.c:2179
 #, c-format
 msgid "gpg-agent protocol version %d is not supported\n"
@@ -688,10 +598,7 @@ msgstr ""
 "語法: gpg-preset-passphrase [選項] 金鑰鑰柄\n"
 "密碼快取維護\n"
 
-#: agent/protect-tool.c:113
-#: g10/gpg.c:373
-#: kbx/kbxutil.c:71
-#: sm/gpgsm.c:186
+#: agent/protect-tool.c:113 g10/gpg.c:373 kbx/kbxutil.c:71 sm/gpgsm.c:186
 #: tools/gpgconf.c:60
 msgid ""
 "@Commands:\n"
@@ -700,13 +607,8 @@ msgstr ""
 "@指令:\n"
 " "
 
-#: agent/protect-tool.c:127
-#: g10/gpg.c:441
-#: g10/gpgv.c:69
-#: kbx/kbxutil.c:81
-#: sm/gpgsm.c:226
-#: tools/gpg-connect-agent.c:67
-#: tools/gpgconf.c:77
+#: agent/protect-tool.c:127 g10/gpg.c:441 g10/gpgv.c:69 kbx/kbxutil.c:81
+#: sm/gpgsm.c:226 tools/gpg-connect-agent.c:67 tools/gpgconf.c:77
 #: tools/symcryptrun.c:156
 msgid ""
 "@\n"
@@ -738,7 +640,9 @@ msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "請輸入密語來保護新的 PKCS#12 物件."
 
 #: agent/protect-tool.c:1173
-msgid "Please enter the passphrase to protect the imported object within the GnuPG system."
+msgid ""
+"Please enter the passphrase to protect the imported object within the GnuPG "
+"system."
 msgstr "請輸入密語以保護匯入至 GnuPG 系統內的物件."
 
 #: agent/protect-tool.c:1178
@@ -749,37 +653,30 @@ msgstr ""
 "請輸入完成這項操作所需的\n"
 "密語或個人識別碼 (PIN)."
 
-#: agent/protect-tool.c:1183
-#: tools/symcryptrun.c:434
+#: agent/protect-tool.c:1183 tools/symcryptrun.c:434
 msgid "Passphrase:"
 msgstr "密語:"
 
-#: agent/protect-tool.c:1188
-#: tools/symcryptrun.c:445
+#: agent/protect-tool.c:1188 tools/symcryptrun.c:445
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:1190
-#: tools/symcryptrun.c:441
+#: agent/protect-tool.c:1190 tools/symcryptrun.c:441
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "詢問密語時出錯: %s\n"
 
-#: agent/trustlist.c:136
-#: agent/trustlist.c:334
+#: agent/trustlist.c:136 agent/trustlist.c:334
 #, c-format
 msgid "error opening `%s': %s\n"
 msgstr "開啟 `%s' 時出錯: %s\n"
 
-#: agent/trustlist.c:151
-#: common/helpfile.c:63
-#: common/helpfile.c:79
+#: agent/trustlist.c:151 common/helpfile.c:63 common/helpfile.c:79
 #, c-format
 msgid "file `%s', line %d: %s\n"
 msgstr "檔案 `%s', 第 %d 列: %s\n"
 
-#: agent/trustlist.c:171
-#: agent/trustlist.c:179
+#: agent/trustlist.c:171 agent/trustlist.c:179
 #, c-format
 msgid "statement \"%s\" ignored in `%s', line %d\n"
 msgstr "命令 \"%s\" 忽略於 `%s', 第 %d 列\n"
@@ -794,20 +691,17 @@ msgstr "沒有系統信任清單 `%s' 可用\n"
 msgid "bad fingerprint in `%s', line %d\n"
 msgstr "不良的指紋於 `%s', 第 %d 列\n"
 
-#: agent/trustlist.c:254
-#: agent/trustlist.c:261
+#: agent/trustlist.c:254 agent/trustlist.c:261
 #, c-format
 msgid "invalid keyflag in `%s', line %d\n"
 msgstr "無效的金鑰旗標於 `%s', 第 %d 列\n"
 
-#: agent/trustlist.c:295
-#: common/helpfile.c:126
+#: agent/trustlist.c:295 common/helpfile.c:126
 #, c-format
 msgid "error reading `%s', line %d: %s\n"
 msgstr "讀取 `%s' 時出錯, 第 %d 列: %s\n"
 
-#: agent/trustlist.c:400
-#: agent/trustlist.c:450
+#: agent/trustlist.c:400 agent/trustlist.c:450
 msgid "error reading list of trusted root certificates\n"
 msgstr "讀取已信任根憑證清單時出錯\n"
 
@@ -821,16 +715,16 @@ msgstr "讀取已信任根憑證清單時出錯\n"
 #. certificate.
 #: agent/trustlist.c:611
 #, c-format
-msgid "Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user certificates?"
+msgid ""
+"Do you ultimately trust%%0A  \"%s\"%%0Ato correctly certify user "
+"certificates?"
 msgstr "請問你是否徹底信任%%0A  \"%s\"%%0A正確驗證使用者憑證的能力?"
 
-#: agent/trustlist.c:620
-#: common/audit.c:467
+#: agent/trustlist.c:620 common/audit.c:467
 msgid "Yes"
 msgstr "Yes"
 
-#: agent/trustlist.c:620
-#: common/audit.c:469
+#: agent/trustlist.c:620 common/audit.c:469
 msgid "No"
 msgstr "No"
 
@@ -844,7 +738,9 @@ msgstr "No"
 #. as stored in the certificate.
 #: agent/trustlist.c:654
 #, c-format
-msgid "Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the fingerprint:%%0A  %s"
+msgid ""
+"Please verify that the certificate identified as:%%0A  \"%s\"%%0Ahas the "
+"fingerprint:%%0A  %s"
 msgstr "請驗證憑證與此完全相同:%%0A  \"%s\"%%0A其指紋為:%%0A  %s"
 
 #. TRANSLATORS: "Correct" is the label of a button and intended
@@ -865,11 +761,12 @@ msgstr "請注意: 密語從未變更過.%0A請現在就變更."
 
 #: agent/findkey.c:172
 #, c-format
-msgid "This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change it now."
+msgid ""
+"This passphrase has not been changed%%0Asince %.4s-%.2s-%.2s.  Please change "
+"it now."
 msgstr "密語從下列時刻起就沒有變更過:%%0A%.4s-%.2s-%.2s.  請現在就變更."
 
-#: agent/findkey.c:186
-#: agent/findkey.c:193
+#: agent/findkey.c:186 agent/findkey.c:193
 msgid "Change passphrase"
 msgstr "更改密語"
 
@@ -877,29 +774,23 @@ msgstr "更改密語"
 msgid "I'll change it later"
 msgstr "我稍後再變更"
 
-#: common/exechelp.c:528
-#: common/exechelp.c:625
-#: 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:599
-#: common/exechelp.c:658
+#: 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:637
-#: common/exechelp.c:765
-#: common/exechelp.c:1000
+#: common/exechelp.c:637 common/exechelp.c:765 common/exechelp.c:1002
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "衍生執行程序時出錯: %s\n"
 
-#: common/exechelp.c:811
-#: common/exechelp.c:864
+#: common/exechelp.c:811 common/exechelp.c:864
 #, c-format
 msgid "waiting for process %d to terminate failed: %s\n"
 msgstr "等候 %d 處理程序終止時失敗: %s\n"
@@ -909,8 +800,7 @@ msgstr "等候 %d 處理程序終止時失敗: %s\n"
 msgid "error getting exit code of process %d: %s\n"
 msgstr "取得 %d 執行程序結束碼時出錯: %s\n"
 
-#: common/exechelp.c:825
-#: common/exechelp.c:875
+#: common/exechelp.c:825 common/exechelp.c:877
 #, c-format
 msgid "error running `%s': exit status %d\n"
 msgstr "執行 `%s' 時出錯: 結束狀態 %d\n"
@@ -920,7 +810,7 @@ msgstr "執行 `%s' 時出錯: 結束狀態 %d\n"
 msgid "error running `%s': probably not installed\n"
 msgstr "執行 `%s' 時出錯: 可能尚未安裝\n"
 
-#: common/exechelp.c:883
+#: common/exechelp.c:885
 #, c-format
 msgid "error running `%s': terminated\n"
 msgstr "執行 `%s' 時出錯: 已終止\n"
@@ -951,13 +841,11 @@ msgstr "與 gpg-agent 的溝通問題\n"
 msgid "problem setting the gpg-agent options\n"
 msgstr "設定 gpg-agent 選項時發生問題\n"
 
-#: common/simple-pwquery.c:579
-#: common/simple-pwquery.c:675
+#: common/simple-pwquery.c:579 common/simple-pwquery.c:675
 msgid "canceled by user\n"
 msgstr "由使用者取消\n"
 
-#: common/simple-pwquery.c:594
-#: common/simple-pwquery.c:681
+#: common/simple-pwquery.c:594 common/simple-pwquery.c:681
 msgid "problem with the agent\n"
 msgstr "代理程式的問題\n"
 
@@ -977,24 +865,20 @@ msgid "Warning: unsafe permissions on %s \"%s\"\n"
 msgstr "警告: %s 的權限 \"%s\" 並不安全\n"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:35
-#: common/yesno.c:72
+#: common/yesno.c:35 common/yesno.c:72
 msgid "yes"
 msgstr "yes"
 
-#: common/yesno.c:36
-#: common/yesno.c:77
+#: common/yesno.c:36 common/yesno.c:77
 msgid "yY"
 msgstr "yY"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: common/yesno.c:38
-#: common/yesno.c:74
+#: common/yesno.c:38 common/yesno.c:74
 msgid "no"
 msgstr "no"
 
-#: common/yesno.c:39
-#: common/yesno.c:78
+#: common/yesno.c:39 common/yesno.c:78
 msgid "nN"
 msgstr "nN"
 
@@ -1035,12 +919,16 @@ msgstr "在安全記憶體配置 %lu 位元組時超出核心"
 msgid "out of core while allocating %lu bytes"
 msgstr "配置 %lu 位元組時超出核心"
 
-#: common/asshelp.c:208
-#: tools/gpg-connect-agent.c:2129
+#: common/asshelp.c:293 tools/gpg-connect-agent.c:2129
 msgid "no running gpg-agent - starting one\n"
 msgstr "沒有執行中的 gpg-agent - 正在啟動一份\n"
 
-#: common/asshelp.c:314
+#: common/asshelp.c:349
+#, c-format
+msgid "waiting %d seconds for the agent to come up\n"
+msgstr ""
+
+#: common/asshelp.c:426
 msgid "can't connect to the agent - trying fall back\n"
 msgstr "無法連線至代理程式 - 正試著退回\n"
 
@@ -1098,10 +986,7 @@ msgstr "根憑證遺失"
 msgid "Data encryption succeeded"
 msgstr "資料已加密成功"
 
-#: common/audit.c:764
-#: common/audit.c:830
-#: common/audit.c:906
-#: common/audit.c:997
+#: common/audit.c:764 common/audit.c:830 common/audit.c:906 common/audit.c:997
 msgid "Data available"
 msgstr "有可用的資料"
 
@@ -1109,33 +994,25 @@ msgstr "有可用的資料"
 msgid "Session key created"
 msgstr "階段金鑰已建立"
 
-#: common/audit.c:772
-#: common/audit.c:912
-#: common/audit.c:919
+#: common/audit.c:772 common/audit.c:912 common/audit.c:919
 #, c-format
 msgid "algorithm: %s"
 msgstr "演算法: %s"
 
-#: common/audit.c:774
-#: common/audit.c:776
-#: common/audit.c:921
-#: common/audit.c:923
+#: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "未支援的演算法: %s"
 
-#: common/audit.c:778
-#: common/audit.c:925
+#: common/audit.c:778 common/audit.c:925
 msgid "seems to be not encrypted"
 msgstr "看起來未加密"
 
-#: common/audit.c:784
-#: common/audit.c:933
+#: common/audit.c:784 common/audit.c:933
 msgid "Number of recipients"
 msgstr "收件者數量"
 
-#: common/audit.c:792
-#: common/audit.c:956
+#: common/audit.c:792 common/audit.c:956
 #, c-format
 msgid "Recipient %d"
 msgstr "收件者 %d"
@@ -1144,9 +1021,7 @@ msgstr "收件者 %d"
 msgid "Data signing succeeded"
 msgstr "資料已簽署成功"
 
-#: common/audit.c:839
-#: common/audit.c:1033
-#: common/audit.c:1060
+#: common/audit.c:839 common/audit.c:1033 common/audit.c:1060
 #, c-format
 msgid "data hash algorithm: %s"
 msgstr "資料雜湊演算法: %s"
@@ -1156,8 +1031,7 @@ msgstr "資料雜湊演算法: %s"
 msgid "Signer %d"
 msgstr "簽署者 %d"
 
-#: common/audit.c:866
-#: common/audit.c:1065
+#: common/audit.c:866 common/audit.c:1065
 #, c-format
 msgid "attr hash algorithm: %s"
 msgstr "屬性雜湊演算法: %s"
@@ -1200,13 +1074,11 @@ msgstr "憑證鏈有效"
 msgid "Root certificate trustworthy"
 msgstr "根憑證可信賴"
 
-#: common/audit.c:1111
-#: sm/certchain.c:935
+#: common/audit.c:1111 sm/certchain.c:935
 msgid "no CRL found for certificate"
 msgstr "找不到用於憑證的 CRL"
 
-#: common/audit.c:1114
-#: sm/certchain.c:945
+#: common/audit.c:1114 sm/certchain.c:945
 msgid "the available CRL is too old"
 msgstr "可用的 CRL 太舊了"
 
@@ -1280,53 +1152,54 @@ msgstr "未預期的封裝: "
 msgid "invalid dash escaped line: "
 msgstr "無效的破折號逸出列: "
 
-#: g10/armor.c:809
-#: g10/armor.c:1419
+#: g10/armor.c:810 g10/armor.c:1420
 #, c-format
 msgid "invalid radix64 character %02X skipped\n"
 msgstr "無效的 64 進位字符 %02x 已跳過\n"
 
-#: g10/armor.c:852
+#: g10/armor.c:853
 msgid "premature eof (no CRC)\n"
 msgstr "檔案未預期的結束 (沒有 CRC 的部分)\n"
 
-#: g10/armor.c:886
+#: g10/armor.c:887
 msgid "premature eof (in CRC)\n"
 msgstr "檔案未預期的結束 (CRC 的部分未結束)\n"
 
-#: g10/armor.c:894
+#: g10/armor.c:895
 msgid "malformed CRC\n"
 msgstr "CRC 被變造過\n"
 
-#: g10/armor.c:898
-#: g10/armor.c:1456
+#: g10/armor.c:899 g10/armor.c:1457
 #, c-format
 msgid "CRC error; %06lX - %06lX\n"
 msgstr "CRC 錯誤; %06lX - %06lX\n"
 
-#: g10/armor.c:918
+#: g10/armor.c:919
 msgid "premature eof (in trailer)\n"
 msgstr "檔案未預期的結束 (於結尾處)\n"
 
-#: g10/armor.c:922
+#: g10/armor.c:923
 msgid "error in trailer line\n"
 msgstr "結尾列有問題\n"
 
-#: g10/armor.c:1233
+#: g10/armor.c:1234
 msgid "no valid OpenPGP data found.\n"
 msgstr "找不到有效的 OpenPGP 資料.\n"
 
-#: g10/armor.c:1238
+#: g10/armor.c:1239
 #, c-format
 msgid "invalid armor: line longer than %d characters\n"
 msgstr "無效的封裝: 列長超出 %d 字符\n"
 
-#: g10/armor.c:1242
-msgid "quoted printable character in armor - probably a buggy MTA has been used\n"
+#: g10/armor.c:1243
+msgid ""
+"quoted printable character in armor - probably a buggy MTA has been used\n"
 msgstr "封裝裡出現被引號括住的可列印字符 - 可能是有瑕疵的送信程式造成的\n"
 
 #: g10/build-packet.c:976
-msgid "a notation name must have only printable characters or spaces, and end with an '='\n"
+msgid ""
+"a notation name must have only printable characters or spaces, and end with "
+"an '='\n"
 msgstr "標記名稱一定要採用可印出的字符或空白, 並以一個 '=' 來結尾\n"
 
 #: g10/build-packet.c:988
@@ -1341,18 +1214,15 @@ msgstr "使用者標記名稱不得含有兩個或更多的 '@' 字符\n"
 msgid "a notation value must not use any control characters\n"
 msgstr "標記值一定不能使用任何的控制字符\n"
 
-#: g10/build-packet.c:1046
-#: g10/build-packet.c:1055
+#: g10/build-packet.c:1046 g10/build-packet.c:1055
 msgid "WARNING: invalid notation data found\n"
 msgstr "警告: 找到無效的標記資料\n"
 
-#: g10/build-packet.c:1077
-#: g10/build-packet.c:1079
+#: g10/build-packet.c:1077 g10/build-packet.c:1079
 msgid "not human readable"
 msgstr "不是人類能讀得懂的"
 
-#: g10/card-util.c:85
-#: g10/card-util.c:371
+#: g10/card-util.c:85 g10/card-util.c:371
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "沒有可用的 OpenPGP 卡片: %s\n"
@@ -1362,13 +1232,8 @@ msgstr "沒有可用的 OpenPGP 卡片: %s\n"
 msgid "OpenPGP card no. %s detected\n"
 msgstr "偵測到 OpenPGP 卡片編號 %s\n"
 
-#: g10/card-util.c:98
-#: g10/card-util.c:1770
-#: g10/delkey.c:126
-#: g10/keyedit.c:1549
-#: g10/keygen.c:3068
-#: g10/revoke.c:216
-#: g10/revoke.c:455
+#: g10/card-util.c:98 g10/card-util.c:1770 g10/delkey.c:126 g10/keyedit.c:1551
+#: g10/keygen.c:3068 g10/revoke.c:216 g10/revoke.c:455
 msgid "can't do this in batch mode\n"
 msgstr "無法在批次模式中這樣做\n"
 
@@ -1376,27 +1241,18 @@ msgstr "無法在批次模式中這樣做\n"
 msgid "This command is only available for version 2 cards\n"
 msgstr "祇有第二版卡片纔能用這個指令\n"
 
-#: g10/card-util.c:108
-#: scd/app-openpgp.c:2020
+#: g10/card-util.c:108 scd/app-openpgp.c:2020
 msgid "Reset Code not or not anymore available\n"
 msgstr "(再也) 沒有重設碼\n"
 
-#: g10/card-util.c:141
-#: g10/card-util.c:1455
-#: g10/card-util.c:1565
-#: g10/keyedit.c:424
-#: g10/keyedit.c:445
-#: g10/keyedit.c:459
-#: g10/keygen.c:1630
-#: g10/keygen.c:1711
-#: sm/certreqgen-ui.c:165
-#: sm/certreqgen-ui.c:249
+#: g10/card-util.c:141 g10/card-util.c:1455 g10/card-util.c:1565
+#: g10/keyedit.c:424 g10/keyedit.c:445 g10/keyedit.c:459 g10/keygen.c:1630
+#: g10/keygen.c:1711 sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:249
 #: sm/certreqgen-ui.c:283
 msgid "Your selection? "
 msgstr "你要選哪一個? "
 
-#: g10/card-util.c:269
-#: g10/card-util.c:319
+#: g10/card-util.c:269 g10/card-util.c:319
 msgid "[not set]"
 msgstr "[未設定]"
 
@@ -1454,14 +1310,12 @@ msgstr "取回公鑰的 URL: "
 msgid "Error: URL too long (limit is %d characters).\n"
 msgstr "錯誤: URL 太長 (上限是 %d 個字符).\n"
 
-#: g10/card-util.c:791
-#: tools/no-libgcrypt.c:30
+#: g10/card-util.c:791 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr "配置足夠的記憶體時出錯: %s\n"
 
-#: g10/card-util.c:803
-#: g10/import.c:283
+#: g10/card-util.c:803 g10/import.c:283
 #, c-format
 msgid "error reading `%s': %s\n"
 msgstr "讀取 `%s' 時出錯: %s\n"
@@ -1560,17 +1414,13 @@ msgstr "你的加密金鑰想要用多大的金鑰尺寸? (%u) "
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr "你的認證金鑰想要用多大的金鑰尺寸? (%u) "
 
-#: g10/card-util.c:1306
-#: g10/keygen.c:1844
-#: g10/keygen.c:1850
+#: g10/card-util.c:1306 g10/keygen.c:1844 g10/keygen.c:1850
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "加大到 %u 位元\n"
 
-#: g10/card-util.c:1314
-#: g10/keygen.c:1831
-#: sm/certreqgen-ui.c:184
+#: g10/card-util.c:1314 g10/keygen.c:1831 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 金鑰尺寸一定要介於 %u 到 %u 之間\n"
@@ -1612,28 +1462,20 @@ msgstr ""
 msgid "Please select the type of key to generate:\n"
 msgstr "請選擇你要產生的金鑰種類:\n"
 
-#: g10/card-util.c:1448
-#: g10/card-util.c:1556
+#: g10/card-util.c:1448 g10/card-util.c:1556
 msgid "   (1) Signature key\n"
 msgstr "   (1) 簽署用金鑰\n"
 
-#: g10/card-util.c:1449
-#: g10/card-util.c:1558
+#: g10/card-util.c:1449 g10/card-util.c:1558
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密用金鑰\n"
 
-#: g10/card-util.c:1450
-#: g10/card-util.c:1560
+#: g10/card-util.c:1450 g10/card-util.c:1560
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 憑證用金鑰\n"
 
-#: g10/card-util.c:1466
-#: g10/card-util.c:1585
-#: g10/keyedit.c:945
-#: g10/keygen.c:1634
-#: g10/keygen.c:1662
-#: g10/keygen.c:1764
-#: g10/revoke.c:683
+#: g10/card-util.c:1466 g10/card-util.c:1585 g10/keyedit.c:945
+#: g10/keygen.c:1634 g10/keygen.c:1662 g10/keygen.c:1764 g10/revoke.c:683
 msgid "Invalid selection.\n"
 msgstr "無效的選擇.\n"
 
@@ -1658,8 +1500,7 @@ msgstr "私鑰已經存放在卡片上了\n"
 msgid "error writing key to card: %s\n"
 msgstr "金鑰寫入卡片時出錯: %s\n"
 
-#: g10/card-util.c:1679
-#: g10/keyedit.c:1380
+#: g10/card-util.c:1679 g10/keyedit.c:1382
 msgid "quit this menu"
 msgstr "離開這個選單"
 
@@ -1667,8 +1508,7 @@ msgstr "離開這個選單"
 msgid "show admin commands"
 msgstr "顯示管理者指令"
 
-#: g10/card-util.c:1682
-#: g10/keyedit.c:1383
+#: g10/card-util.c:1682 g10/keyedit.c:1385
 msgid "show this help"
 msgstr "顯示這份線上說明"
 
@@ -1740,45 +1580,32 @@ msgstr "允許使用管理者指令\n"
 msgid "Admin commands are not allowed\n"
 msgstr "未允許使用管理者指令\n"
 
-#: g10/card-util.c:1985
-#: g10/keyedit.c:2290
+#: g10/card-util.c:1985 g10/keyedit.c:2292
 msgid "Invalid command  (try \"help\")\n"
 msgstr "無效的指令  (試試看 \"help\")\n"
 
-#: g10/decrypt.c:110
-#: g10/encode.c:876
+#: g10/decrypt.c:110 g10/encode.c:876
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在這個指令中沒有作用\n"
 
-#: g10/decrypt.c:166
-#: g10/gpg.c:4023
-#: g10/keyring.c:387
-#: g10/keyring.c:698
+#: g10/decrypt.c:166 g10/gpg.c:4019 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:3514
-#: g10/keyserver.c:1737
+#: g10/delkey.c:73 g10/export.c:324 g10/keyedit.c:3515 g10/keyserver.c:1737
 #: 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:1751
-#: g10/revoke.c:232
-#: g10/revoke.c:477
+#: g10/delkey.c:81 g10/export.c:354 g10/import.c:2483 g10/keyserver.c:1751
+#: g10/revoke.c:232 g10/revoke.c:477
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "讀取金鑰區塊時出錯: %s\n"
 
-#: g10/delkey.c:127
-#: g10/delkey.c:134
+#: g10/delkey.c:127 g10/delkey.c:134
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "(除非你用指紋指定了金鑰)\n"
 
@@ -1812,8 +1639,7 @@ msgstr "公鑰 \"%s\" 有相對應的私鑰!\n"
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "請先以 \"--delete-secret-keys\" 選項來刪除它.\n"
 
-#: g10/encode.c:226
-#: g10/sign.c:1269
+#: g10/encode.c:226 g10/sign.c:1269
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "建立密語時出錯: %s\n"
@@ -1827,15 +1653,12 @@ msgstr "因處於 S2K 模式下而無法使用對稱式 ESK 封包\n"
 msgid "using cipher %s\n"
 msgstr "正在使用 %s 編密法\n"
 
-#: g10/encode.c:256
-#: g10/encode.c:577
+#: g10/encode.c:256 g10/encode.c:577
 #, c-format
 msgid "`%s' already compressed\n"
 msgstr "`%s' 已經被壓縮了\n"
 
-#: g10/encode.c:311
-#: g10/encode.c:611
-#: g10/sign.c:564
+#: g10/encode.c:311 g10/encode.c:611 g10/sign.c:564
 #, c-format
 msgid "WARNING: `%s' is an empty file\n"
 msgstr "警告: `%s' 是個空檔案\n"
@@ -1850,18 +1673,21 @@ msgid "reading from `%s'\n"
 msgstr "正在從 `%s' 讀取中\n"
 
 #: g10/encode.c:541
-msgid "unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
+msgid ""
+"unable to use the IDEA cipher for all of the keys you are encrypting to.\n"
 msgstr "你正要用來加密的所有金鑰都不能使用 IDEA 編密法.\n"
 
 #: g10/encode.c:559
 #, c-format
-msgid "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:655
-#: g10/sign.c:939
+#: g10/encode.c:655 g10/sign.c:939
 #, c-format
-msgid "WARNING: forcing compression algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing compression algorithm %s (%d) violates recipient "
+"preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設定\n"
 
 #: g10/encode.c:751
@@ -1869,9 +1695,7 @@ msgstr "警告: 強迫使用 %s (%d) 壓縮演算法會違反收件者偏好設�
 msgid "forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "強迫使用 %s (%d) 對稱式編密法會違反收件者偏好設定\n"
 
-#: g10/encode.c:821
-#: g10/pkclist.c:813
-#: g10/pkclist.c:862
+#: g10/encode.c:821 g10/pkclist.c:813 g10/pkclist.c:862
 #, c-format
 msgid "you may not use %s while in %s mode\n"
 msgstr "你不能夠將 %s 用於 %s 模式中\n"
@@ -1881,21 +1705,19 @@ msgstr "你不能夠將 %s 用於 %s 模式中\n"
 msgid "%s/%s encrypted for: \"%s\"\n"
 msgstr "%s/%s 已加密給: \"%s\"\n"
 
-#: g10/encr-data.c:92
-#: g10/mainproc.c:286
+#: g10/encr-data.c:92 g10/mainproc.c:286
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 已加密的資料\n"
 
-#: g10/encr-data.c:95
-#: g10/mainproc.c:290
+#: g10/encr-data.c:95 g10/mainproc.c:290
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以 %d 未知演算法所加密\n"
 
-#: g10/encr-data.c:133
-#: sm/decrypt.c:126
-msgid "WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
+#: g10/encr-data.c:133 sm/decrypt.c:126
+msgid ""
+"WARNING: message was encrypted with a weak key in the symmetric cipher.\n"
 msgstr "警告: 訊息已用對稱式編密法的弱金鑰加密了.\n"
 
 #: g10/encr-data.c:145
@@ -1907,7 +1729,8 @@ msgid "no remote program execution supported\n"
 msgstr "沒有支援的遠端程式執行\n"
 
 #: g10/exec.c:308
-msgid "external program calls are disabled due to unsafe options file permissions\n"
+msgid ""
+"external program calls are disabled due to unsafe options file permissions\n"
 msgstr "因為不安全的檔案權限選項, 而禁用了外部程式叫用\n"
 
 #: g10/exec.c:338
@@ -1929,8 +1752,7 @@ msgstr "無法執行 shell `%s': %s\n"
 msgid "system error while calling external program: %s\n"
 msgstr "叫用外部程式時發生系統錯誤: %s\n"
 
-#: g10/exec.c:521
-#: g10/exec.c:588
+#: g10/exec.c:521 g10/exec.c:588
 msgid "unnatural exit of external program\n"
 msgstr "外部程式不自然地離開\n"
 
@@ -1943,8 +1765,7 @@ msgstr "無法執行外部程式\n"
 msgid "unable to read external program response: %s\n"
 msgstr "無法讀取外部程式回應: %s\n"
 
-#: g10/exec.c:599
-#: g10/exec.c:606
+#: g10/exec.c:599 g10/exec.c:606
 #, c-format
 msgid "WARNING: unable to remove tempfile (%s) `%s': %s\n"
 msgstr "警告: 無法移除暫存檔 (%s) `%s': %s\n"
@@ -2047,8 +1868,7 @@ msgstr "沒有指紋"
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "無效的金鑰 %s 可以藉由 --allow-non-selfsigned-uid 而生效\n"
 
-#: g10/getkey.c:2533
-#: g10/keyedit.c:3839
+#: g10/getkey.c:2533 g10/keyedit.c:3840
 #, c-format
 msgid "no secret subkey for public subkey %s - ignoring\n"
 msgstr "公鑰 %s 沒有相對應的私鑰 - 正在忽略\n"
@@ -2063,43 +1883,35 @@ msgstr "使用子鑰 %s 來替換主鑰 %s\n"
 msgid "key %s: secret key without public key - skipped\n"
 msgstr "金鑰 %s: 祇有私鑰而沒有公鑰 - 已跳過\n"
 
-#: g10/gpg.c:375
-#: sm/gpgsm.c:188
+#: g10/gpg.c:375 sm/gpgsm.c:188
 msgid "make a signature"
 msgstr "建立簽章"
 
-#: g10/gpg.c:376
-#: sm/gpgsm.c:189
+#: g10/gpg.c:376 sm/gpgsm.c:189
 msgid "make a clear text signature"
 msgstr "建立明文簽章"
 
-#: g10/gpg.c:377
-#: sm/gpgsm.c:190
+#: g10/gpg.c:377 sm/gpgsm.c:190
 msgid "make a detached signature"
 msgstr "建立分離式簽章"
 
-#: g10/gpg.c:378
-#: sm/gpgsm.c:191
+#: g10/gpg.c:378 sm/gpgsm.c:191
 msgid "encrypt data"
 msgstr "加密資料"
 
-#: g10/gpg.c:380
-#: sm/gpgsm.c:192
+#: g10/gpg.c:380 sm/gpgsm.c:192
 msgid "encryption only with symmetric cipher"
 msgstr "僅使用對稱式編密法來加密"
 
-#: g10/gpg.c:382
-#: sm/gpgsm.c:193
+#: g10/gpg.c:382 sm/gpgsm.c:193
 msgid "decrypt data (default)"
 msgstr "資料解密 (預設)"
 
-#: g10/gpg.c:384
-#: sm/gpgsm.c:194
+#: g10/gpg.c:384 sm/gpgsm.c:194
 msgid "verify a signature"
 msgstr "驗證簽章"
 
-#: g10/gpg.c:386
-#: sm/gpgsm.c:195
+#: g10/gpg.c:386 sm/gpgsm.c:195
 msgid "list keys"
 msgstr "列出金鑰"
 
@@ -2111,18 +1923,15 @@ msgstr "列出金鑰和簽章"
 msgid "list and check key signatures"
 msgstr "列出並檢查金鑰簽章"
 
-#: g10/gpg.c:390
-#: sm/gpgsm.c:200
+#: g10/gpg.c:390 sm/gpgsm.c:200
 msgid "list keys and fingerprints"
 msgstr "列出金鑰和指紋"
 
-#: g10/gpg.c:391
-#: sm/gpgsm.c:198
+#: g10/gpg.c:391 sm/gpgsm.c:198
 msgid "list secret keys"
 msgstr "列出私鑰"
 
-#: g10/gpg.c:392
-#: sm/gpgsm.c:201
+#: g10/gpg.c:392 sm/gpgsm.c:201
 msgid "generate a new key pair"
 msgstr "產生新的金鑰對"
 
@@ -2130,8 +1939,7 @@ msgstr "產生新的金鑰對"
 msgid "generate a revocation certificate"
 msgstr "產生撤銷憑證"
 
-#: g10/gpg.c:395
-#: sm/gpgsm.c:203
+#: g10/gpg.c:395 sm/gpgsm.c:203
 msgid "remove keys from the public keyring"
 msgstr "從公鑰鑰匙圈裡移除金鑰"
 
@@ -2151,8 +1959,7 @@ msgstr "僅在本機簽署金鑰"
 msgid "sign or edit a key"
 msgstr "簽署或編輯金鑰"
 
-#: g10/gpg.c:402
-#: sm/gpgsm.c:215
+#: g10/gpg.c:402 sm/gpgsm.c:215
 msgid "change a passphrase"
 msgstr "更改密語"
 
@@ -2160,13 +1967,11 @@ msgstr "更改密語"
 msgid "export keys"
 msgstr "匯出金鑰"
 
-#: g10/gpg.c:405
-#: sm/gpgsm.c:204
+#: g10/gpg.c:405 sm/gpgsm.c:204
 msgid "export keys to a key server"
 msgstr "把金鑰匯出至金鑰伺服器"
 
-#: g10/gpg.c:406
-#: sm/gpgsm.c:205
+#: g10/gpg.c:406 sm/gpgsm.c:205
 msgid "import keys from a key server"
 msgstr "從金鑰伺服器匯入金鑰"
 
@@ -2202,23 +2007,19 @@ msgstr "更新信任資料庫"
 msgid "print message digests"
 msgstr "印出訊息摘要"
 
-#: g10/gpg.c:439
-#: sm/gpgsm.c:210
+#: g10/gpg.c:439 sm/gpgsm.c:210
 msgid "run in server mode"
 msgstr "以伺服器模式執行"
 
-#: g10/gpg.c:443
-#: sm/gpgsm.c:228
+#: g10/gpg.c:443 sm/gpgsm.c:228
 msgid "create ascii armored output"
 msgstr "建立以 ASCII 封裝過的輸出"
 
-#: g10/gpg.c:446
-#: sm/gpgsm.c:241
+#: g10/gpg.c:446 sm/gpgsm.c:241
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|使用者-ID|以「使用者-ID」作為加密對象"
 
-#: g10/gpg.c:459
-#: sm/gpgsm.c:278
+#: g10/gpg.c:459 sm/gpgsm.c:278
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|使用者-ID|拿「使用者-ID」來簽署或解密"
 
@@ -2230,15 +2031,11 @@ msgstr "|N|設定壓縮等級為 N (0 表示不壓縮)"
 msgid "use canonical text mode"
 msgstr "使用標準的文字模式"
 
-#: g10/gpg.c:485
-#: sm/gpgsm.c:280
+#: g10/gpg.c:485 sm/gpgsm.c:280
 msgid "|FILE|write output to FILE"
 msgstr "|檔案|將輸出寫入至「檔案」"
 
-#: g10/gpg.c:501
-#: kbx/kbxutil.c:90
-#: sm/gpgsm.c:292
-#: tools/gpgconf.c:82
+#: g10/gpg.c:501 kbx/kbxutil.c:90 sm/gpgsm.c:292 tools/gpgconf.c:82
 msgid "do not make any changes"
 msgstr "不要做任何改變"
 
@@ -2250,8 +2047,7 @@ msgstr "覆寫前先詢問"
 msgid "use strict OpenPGP behavior"
 msgstr "使用嚴謹的 OpenPGP 行為"
 
-#: g10/gpg.c:585
-#: sm/gpgsm.c:336
+#: g10/gpg.c:585 sm/gpgsm.c:336
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2259,8 +2055,7 @@ msgstr ""
 "@\n"
 "(請參照線上說明頁面來取得所有命令和選項的完整清單)\n"
 
-#: g10/gpg.c:588
-#: sm/gpgsm.c:339
+#: g10/gpg.c:588 sm/gpgsm.c:339
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2294,8 +2089,7 @@ msgstr ""
 "簽署, 檢查, 加密或解密\n"
 "預設的操作會依輸入資料而定\n"
 
-#: g10/gpg.c:850
-#: sm/gpgsm.c:543
+#: g10/gpg.c:850 sm/gpgsm.c:543
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2307,8 +2101,7 @@ msgstr ""
 msgid "Pubkey: "
 msgstr "公鑰: "
 
-#: g10/gpg.c:860
-#: g10/keyedit.c:2422
+#: g10/gpg.c:860 g10/keyedit.c:2423
 msgid "Cipher: "
 msgstr "編密法: "
 
@@ -2316,8 +2109,7 @@ msgstr "編密法: "
 msgid "Hash: "
 msgstr "雜湊: "
 
-#: g10/gpg.c:874
-#: g10/keyedit.c:2467
+#: g10/gpg.c:874 g10/keyedit.c:2468
 msgid "Compression: "
 msgstr "壓縮: "
 
@@ -2325,8 +2117,7 @@ msgstr "壓縮: "
 msgid "usage: gpg [options] "
 msgstr "用法: gpg [選項] "
 
-#: g10/gpg.c:1158
-#: sm/gpgsm.c:716
+#: g10/gpg.c:1158 sm/gpgsm.c:716
 msgid "conflicting commands\n"
 msgstr "指令彼此矛盾\n"
 
@@ -2372,7 +2163,8 @@ msgstr "警告: 家目錄 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1400
 #, c-format
-msgid "WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory ownership on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄所有權並不安全\n"
 
 #: g10/gpg.c:1403
@@ -2387,7 +2179,8 @@ msgstr "警告: 家目錄 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1412
 #, c-format
-msgid "WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
+msgid ""
+"WARNING: unsafe enclosing directory permissions on configuration file `%s'\n"
 msgstr "警告: 組態檔案 `%s' 的封入目錄權限並不安全\n"
 
 #: g10/gpg.c:1415
@@ -2454,404 +2247,393 @@ msgstr "請注意: 已忽略舊有的預設選項檔 `%s'\n"
 msgid "libgcrypt is too old (need %s, have %s)\n"
 msgstr "libgcrypt 太舊了 (需要 %s, 但是祇有 %s)\n"
 
-#: g10/gpg.c:2350
-#: g10/gpg.c:3041
-#: g10/gpg.c:3053
+#: g10/gpg.c:2346 g10/gpg.c:3037 g10/gpg.c:3049
 #, c-format
 msgid "NOTE: %s is not for normal use!\n"
 msgstr "請注意: 一般情況下不會用到 %s!\n"
 
-#: g10/gpg.c:2534
-#: g10/gpg.c:2546
+#: g10/gpg.c:2530 g10/gpg.c:2542
 #, c-format
 msgid "`%s' is not a valid signature expiration\n"
 msgstr "`%s' 不是個有效的簽章使用期限\n"
 
-#: g10/gpg.c:2628
+#: g10/gpg.c:2624
 #, c-format
 msgid "`%s' is not a valid character set\n"
 msgstr "`%s' 不是個有效的字元集\n"
 
-#: g10/gpg.c:2651
-#: g10/gpg.c:2846
-#: g10/keyedit.c:4197
+#: g10/gpg.c:2647 g10/gpg.c:2842 g10/keyedit.c:4198
 msgid "could not parse keyserver URL\n"
 msgstr "無法剖析金鑰伺服器 URL\n"
 
-#: g10/gpg.c:2663
+#: g10/gpg.c:2659
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s:%d: 無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2666
+#: g10/gpg.c:2662
 msgid "invalid keyserver options\n"
 msgstr "無效的金鑰伺服器選項\n"
 
-#: g10/gpg.c:2673
+#: g10/gpg.c:2669
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s:%d: 無效的匯入選項\n"
 
-#: g10/gpg.c:2676
+#: g10/gpg.c:2672
 msgid "invalid import options\n"
 msgstr "無效的匯入選項\n"
 
-#: g10/gpg.c:2683
+#: g10/gpg.c:2679
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s:%d: 無效的匯出選項\n"
 
-#: g10/gpg.c:2686
+#: g10/gpg.c:2682
 msgid "invalid export options\n"
 msgstr "無效的匯出選項\n"
 
-#: g10/gpg.c:2693
+#: g10/gpg.c:2689
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s:%d: 無效的清單選項\n"
 
-#: g10/gpg.c:2696
+#: g10/gpg.c:2692
 msgid "invalid list options\n"
 msgstr "無效的清單選項\n"
 
-#: g10/gpg.c:2704
+#: g10/gpg.c:2700
 msgid "display photo IDs during signature verification"
 msgstr "驗證簽章時顯示照片 ID"
 
-#: g10/gpg.c:2706
+#: g10/gpg.c:2702
 msgid "show policy URLs during signature verification"
 msgstr "驗證簽章時顯示原則 URL"
 
-#: g10/gpg.c:2708
+#: g10/gpg.c:2704
 msgid "show all notations during signature verification"
 msgstr "驗證簽章時顯示所有的註記"
 
-#: g10/gpg.c:2710
+#: g10/gpg.c:2706
 msgid "show IETF standard notations during signature verification"
 msgstr "驗證簽章時顯示 IETF 標準註記"
 
-#: g10/gpg.c:2714
+#: g10/gpg.c:2710
 msgid "show user-supplied notations during signature verification"
 msgstr "驗證簽章時顯示使用者提供的註記"
 
-#: g10/gpg.c:2716
+#: g10/gpg.c:2712
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "驗證簽章時顯示偏好的金鑰伺服器 URL"
 
-#: g10/gpg.c:2718
+#: g10/gpg.c:2714
 msgid "show user ID validity during signature verification"
 msgstr "驗證簽章時顯示使用者 ID 有效性"
 
-#: g10/gpg.c:2720
+#: g10/gpg.c:2716
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "驗證簽章時顯示已撤銷或過期的使用者 ID"
 
-#: g10/gpg.c:2722
+#: g10/gpg.c:2718
 msgid "show only the primary user ID in signature verification"
 msgstr "驗證簽章時祇顯示主要的使用者 ID"
 
-#: g10/gpg.c:2724
+#: g10/gpg.c:2720
 msgid "validate signatures with PKA data"
 msgstr "以 PKA 資料驗證簽章"
 
-#: g10/gpg.c:2726
+#: g10/gpg.c:2722
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提高對持有有效 PKA 資料之簽章的信任"
 
-#: g10/gpg.c:2733
+#: g10/gpg.c:2729
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 無效的驗證選項\n"
 
-#: g10/gpg.c:2736
+#: g10/gpg.c:2732
 msgid "invalid verify options\n"
 msgstr "無效的驗證選項\n"
 
-#: g10/gpg.c:2743
+#: g10/gpg.c:2739
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "無法把執行檔路徑設成 %s\n"
 
-#: g10/gpg.c:2929
+#: g10/gpg.c:2925
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s:%d: 無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:2932
+#: g10/gpg.c:2928
 msgid "invalid auto-key-locate list\n"
 msgstr "無效的自動金鑰定址清單\n"
 
-#: g10/gpg.c:3030
-#: sm/gpgsm.c:1440
+#: g10/gpg.c:3026 sm/gpgsm.c:1440
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告: 程式可能會傾印出核心檔!\n"
 
-#: g10/gpg.c:3034
+#: g10/gpg.c:3030
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告: %s 會推翻 %s\n"
 
-#: g10/gpg.c:3043
+#: g10/gpg.c:3039
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允許跟 %s 併用!\n"
 
-#: g10/gpg.c:3046
+#: g10/gpg.c:3042
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 跟 %s 放在一起沒有意義!\n"
 
-#: g10/gpg.c:3061
+#: g10/gpg.c:3057
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "因為 %s 而不會在不安全的記憶體中執行\n"
 
-#: g10/gpg.c:3075
+#: g10/gpg.c:3071
 msgid "you can only make detached or clear signatures while in --pgp2 mode\n"
 msgstr "你祇有在 --pgp2 模式下纔能做出分離式或明文簽章\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3077
 msgid "you can't sign and encrypt at the same time while in --pgp2 mode\n"
 msgstr "你在 --pgp2 模式下時, 不能同時簽署和加密\n"
 
-#: g10/gpg.c:3087
+#: g10/gpg.c:3083
 msgid "you must use files (and not a pipe) when working with --pgp2 enabled.\n"
 msgstr "啟用 --pgp2 時你祇應該使用檔案, 而非管道\n"
 
-#: g10/gpg.c:3100
+#: g10/gpg.c:3096
 msgid "encrypting a message in --pgp2 mode requires the IDEA cipher\n"
 msgstr "在 --pgp2 模式下加密訊息需要 IDEA 編密法\n"
 
-#: g10/gpg.c:3167
-#: g10/gpg.c:3191
-#: sm/gpgsm.c:1512
+#: g10/gpg.c:3163 g10/gpg.c:3187 sm/gpgsm.c:1512
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所選的編密演算法無效\n"
 
-#: g10/gpg.c:3173
-#: g10/gpg.c:3197
-#: sm/gpgsm.c:1518
-#: sm/gpgsm.c:1524
+#: g10/gpg.c:3169 g10/gpg.c:3193 sm/gpgsm.c:1518 sm/gpgsm.c:1524
 msgid "selected digest algorithm is invalid\n"
 msgstr "所選的摘要演算法無效\n"
 
-#: g10/gpg.c:3179
+#: g10/gpg.c:3175
 msgid "selected compression algorithm is invalid\n"
 msgstr "所選的壓縮演算法無效\n"
 
-#: g10/gpg.c:3185
+#: g10/gpg.c:3181
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所選的憑證摘要演算法無效\n"
 
-#: g10/gpg.c:3200
+#: g10/gpg.c:3196
 msgid "completes-needed must be greater than 0\n"
 msgstr "completes-needed 一定要大於 0\n"
 
-#: g10/gpg.c:3202
+#: g10/gpg.c:3198
 msgid "marginals-needed must be greater than 1\n"
 msgstr "marginals-needed 一定要大於 1\n"
 
-#: g10/gpg.c:3204
+#: g10/gpg.c:3200
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "max-cert-depth 一定要介於 1 和 255 之間\n"
 
-#: g10/gpg.c:3206
+#: g10/gpg.c:3202
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "無效的 default-cert-level; 一定要是 0, 1, 2 或 3\n"
 
-#: g10/gpg.c:3208
+#: g10/gpg.c:3204
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "無效的 min-cert-level; 一定要是 1, 2 或 3\n"
 
-#: g10/gpg.c:3211
+#: g10/gpg.c:3207
 msgid "NOTE: simple S2K mode (0) is strongly discouraged\n"
 msgstr "請注意: 強烈不建議使用單純的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3215
+#: g10/gpg.c:3211
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "無效的 S2K 模式; 一定要是 0, 1 或 3\n"
 
-#: g10/gpg.c:3222
+#: g10/gpg.c:3218
 msgid "invalid default preferences\n"
 msgstr "無效的預設偏好\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3222
 msgid "invalid personal cipher preferences\n"
 msgstr "無效的個人編密法偏好\n"
 
-#: g10/gpg.c:3230
+#: g10/gpg.c:3226
 msgid "invalid personal digest preferences\n"
 msgstr "無效的個人摘要偏好\n"
 
-#: g10/gpg.c:3234
+#: g10/gpg.c:3230
 msgid "invalid personal compress preferences\n"
 msgstr "無效的個人壓縮偏好\n"
 
-#: g10/gpg.c:3267
+#: g10/gpg.c:3263
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 還沒辦法跟 %s 一起運作\n"
 
-#: g10/gpg.c:3314
+#: g10/gpg.c:3310
 #, c-format
 msgid "you may not use cipher algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 編密演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3319
+#: g10/gpg.c:3315
 #, c-format
 msgid "you may not use digest algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 摘要演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3324
+#: g10/gpg.c:3320
 #, c-format
 msgid "you may not use compression algorithm `%s' while in %s mode\n"
 msgstr "你不該將 `%s' 壓縮演算法用於 %s 模式中\n"
 
-#: g10/gpg.c:3410
+#: g10/gpg.c:3406
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "信任資料庫啟始失敗: %s\n"
 
-#: g10/gpg.c:3421
+#: g10/gpg.c:3417
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告: 給定的收件者 (-r) 未使用公鑰加密\n"
 
-#: g10/gpg.c:3442
+#: g10/gpg.c:3438
 msgid "--store [filename]"
 msgstr "--store [檔名]"
 
-#: g10/gpg.c:3449
+#: g10/gpg.c:3445
 msgid "--symmetric [filename]"
 msgstr "--symmetric [檔名]"
 
-#: g10/gpg.c:3451
+#: g10/gpg.c:3447
 #, c-format
 msgid "symmetric encryption of `%s' failed: %s\n"
 msgstr "`%s' 對稱式加密失敗: %s\n"
 
-#: g10/gpg.c:3461
+#: g10/gpg.c:3457
 msgid "--encrypt [filename]"
 msgstr "--encrypt [檔名]"
 
-#: g10/gpg.c:3474
+#: g10/gpg.c:3470
 msgid "--symmetric --encrypt [filename]"
 msgstr "--symmetric --encrypt [檔名]"
 
-#: g10/gpg.c:3476
+#: g10/gpg.c:3472
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3479
+#: g10/gpg.c:3475
 #, c-format
 msgid "you cannot use --symmetric --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --encrypt\n"
 
-#: g10/gpg.c:3497
+#: g10/gpg.c:3493
 msgid "--sign [filename]"
 msgstr "--sign [檔名]"
 
-#: g10/gpg.c:3510
+#: g10/gpg.c:3506
 msgid "--sign --encrypt [filename]"
 msgstr "--sign --encrypt [檔名]"
 
-#: g10/gpg.c:3525
+#: g10/gpg.c:3521
 msgid "--symmetric --sign --encrypt [filename]"
 msgstr "--symmetric --sign --encrypt [檔名]"
 
-#: g10/gpg.c:3527
+#: g10/gpg.c:3523
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "你不能在 --s2k-mode 0 中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3530
+#: g10/gpg.c:3526
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt while in %s mode\n"
 msgstr "你不能在 %s 模式中使用 --symmetric --sign --encrypt\n"
 
-#: g10/gpg.c:3550
+#: g10/gpg.c:3546
 msgid "--sign --symmetric [filename]"
 msgstr "--sign --symmetric [檔名]"
 
-#: g10/gpg.c:3559
+#: g10/gpg.c:3555
 msgid "--clearsign [filename]"
 msgstr "--clearsign [檔名]"
 
-#: g10/gpg.c:3584
+#: g10/gpg.c:3580
 msgid "--decrypt [filename]"
 msgstr "--decrypt [檔名]"
 
-#: g10/gpg.c:3592
+#: g10/gpg.c:3588
 msgid "--sign-key user-id"
 msgstr "--sign-key 使用者ID"
 
-#: g10/gpg.c:3596
+#: g10/gpg.c:3592
 msgid "--lsign-key user-id"
 msgstr "--lsign-key 使用者ID"
 
-#: g10/gpg.c:3617
+#: g10/gpg.c:3613
 msgid "--edit-key user-id [commands]"
 msgstr "--edit-key 使用者ID [指令]"
 
-#: g10/gpg.c:3633
+#: g10/gpg.c:3629
 msgid "--passwd <user-id>"
 msgstr "--passwd 使用者ID"
 
-#: g10/gpg.c:3720
+#: g10/gpg.c:3716
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "送至金鑰伺服器失敗: %s\n"
 
-#: g10/gpg.c:3722
+#: g10/gpg.c:3718
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "從金鑰伺服器接收失敗: %s\n"
 
-#: g10/gpg.c:3724
+#: g10/gpg.c:3720
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "金鑰匯出失敗: %s\n"
 
-#: g10/gpg.c:3735
+#: g10/gpg.c:3731
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "用金鑰伺服器搜尋失敗: %s\n"
 
-#: g10/gpg.c:3745
+#: g10/gpg.c:3741
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "從金鑰伺服器更新失敗: %s\n"
 
-#: g10/gpg.c:3796
+#: g10/gpg.c:3792
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解開封裝失敗: %s\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3800
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "進行封裝失敗: %s\n"
 
-#: g10/gpg.c:3894
+#: g10/gpg.c:3890
 #, c-format
 msgid "invalid hash algorithm `%s'\n"
 msgstr "無效的 `%s' 雜湊演算法\n"
 
-#: g10/gpg.c:4009
+#: g10/gpg.c:4005
 msgid "[filename]"
 msgstr "[檔名]"
 
-#: g10/gpg.c:4013
+#: g10/gpg.c:4009
 msgid "Go ahead and type your message ...\n"
 msgstr "請開始輸入你的訊息 ...\n"
 
-#: g10/gpg.c:4327
+#: g10/gpg.c:4323
 msgid "the given certification policy URL is invalid\n"
 msgstr "給定的的憑證原則 URL 無效\n"
 
-#: g10/gpg.c:4329
+#: g10/gpg.c:4325
 msgid "the given signature policy URL is invalid\n"
 msgstr "給定的簽章原則 URL 無效\n"
 
-#: g10/gpg.c:4362
+#: g10/gpg.c:4358
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "給定的偏好金鑰伺服器 URL 無效\n"
 
@@ -2863,8 +2645,7 @@ msgstr "|檔案|從鑰匙圈「檔案」裡取用金鑰"
 msgid "make timestamp conflicts only a warning"
 msgstr "僅把時間戳印矛盾視為警告"
 
-#: g10/gpgv.c:78
-#: sm/gpgsm.c:326
+#: g10/gpgv.c:78 sm/gpgsm.c:326
 msgid "|FD|write status info to this FD"
 msgstr "|檔案描述|把狀態資訊寫入此「檔案描述」"
 
@@ -2942,14 +2723,12 @@ msgstr "        已跳過的新金鑰: %lu\n"
 msgid "          w/o user IDs: %lu\n"
 msgstr "       沒有使用者的 ID: %lu\n"
 
-#: g10/import.c:302
-#: sm/import.c:114
+#: g10/import.c:302 sm/import.c:114
 #, c-format
 msgid "              imported: %lu"
 msgstr "                已匯入: %lu"
 
-#: g10/import.c:308
-#: sm/import.c:118
+#: g10/import.c:308 sm/import.c:118
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "              未改變的: %lu\n"
@@ -2974,26 +2753,22 @@ msgstr "              新的簽章: %lu\n"
 msgid "   new key revocations: %lu\n"
 msgstr "          新的金鑰撤銷: %lu\n"
 
-#: g10/import.c:318
-#: sm/import.c:120
+#: g10/import.c:318 sm/import.c:120
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "          已讀取的私鑰: %lu\n"
 
-#: g10/import.c:320
-#: sm/import.c:122
+#: g10/import.c:320 sm/import.c:122
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "          已匯入的私鑰: %lu\n"
 
-#: g10/import.c:322
-#: sm/import.c:124
+#: g10/import.c:322 sm/import.c:124
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr "          未改變的私鑰: %lu\n"
 
-#: g10/import.c:324
-#: sm/import.c:126
+#: g10/import.c:324 sm/import.c:126
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "              未被匯入: %lu\n"
@@ -3008,279 +2783,271 @@ msgstr "      已清除的簽章: %lu\n"
 msgid "      user IDs cleaned: %lu\n"
 msgstr " 已清除的使用者 ID: %lu\n"
 
-#: g10/import.c:569
+#: g10/import.c:609
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
 "algorithms on these user IDs:\n"
 msgstr "警告: 金鑰 %s 的偏好設定含有這些使用者 ID 無法使用的演算法:\n"
 
-#: g10/import.c:610
+#: g10/import.c:650
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         \"%s\": 編密演算法 %s 的偏好設定\n"
 
-#: g10/import.c:625
+#: g10/import.c:665
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         \"%s\": 摘要演算法 %s 的偏好設定\n"
 
-#: g10/import.c:637
+#: g10/import.c:677
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         \"%s\": 壓縮演算法 %s 的偏好設定\n"
 
-#: g10/import.c:650
+#: g10/import.c:690
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "我們強烈建議你更新偏好設定, 並重新\n"
 
-#: g10/import.c:652
+#: g10/import.c:692
 msgid "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "散佈此金鑰, 以避免潛在的演算法不一致問題.\n"
 
-#: g10/import.c:676
+#: g10/import.c:716
 #, c-format
 msgid "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "你可以像這樣來更新偏好設定: gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:729
-#: g10/import.c:1137
+#: g10/import.c:769 g10/import.c:1182
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "金鑰 %s: 沒有使用者 ID\n"
 
-#: g10/import.c:758
+#: g10/import.c:798
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "金鑰 %s: PKS 子鑰的訛誤已被修復\n"
 
-#: g10/import.c:773
+#: g10/import.c:813
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "金鑰 %s: 已接受非自我簽署的使用者 ID \"%s\"\n"
 
-#: g10/import.c:779
+#: g10/import.c:819
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "金鑰 %s: 沒有有效的使用者 ID\n"
 
-#: g10/import.c:781
+#: g10/import.c:821
 msgid "this may be caused by a missing self-signature\n"
 msgstr "這可能肇因於遺失自我簽章所致\n"
 
-#: g10/import.c:791
-#: g10/import.c:1261
+#: g10/import.c:831 g10/import.c:1306
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "金鑰 %s: 找不到公鑰: %s\n"
 
-#: g10/import.c:797
+#: g10/import.c:837
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "金鑰 %s: 新的金鑰 - 已跳過\n"
 
-#: g10/import.c:806
+#: g10/import.c:846
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可寫入的鑰匙圈: %s\n"
 
-#: g10/import.c:811
-#: g10/openfile.c:278
-#: g10/sign.c:805
-#: g10/sign.c:1114
+#: g10/import.c:851 g10/openfile.c:278 g10/sign.c:805 g10/sign.c:1114
 #, c-format
 msgid "writing to `%s'\n"
 msgstr "寫入 `%s' 中\n"
 
-#: g10/import.c:815
-#: g10/import.c:910
-#: g10/import.c:1177
-#: g10/import.c:1322
-#: g10/import.c:2431
-#: g10/import.c:2453
+#: g10/import.c:855 g10/import.c:955 g10/import.c:1222 g10/import.c:1367
+#: g10/import.c:2497 g10/import.c:2519
 #, c-format
 msgid "error writing keyring `%s': %s\n"
 msgstr "寫入鑰匙圈 `%s' 時出錯: %s\n"
 
-#: g10/import.c:834
+#: g10/import.c:874
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "金鑰 %s: 公鑰 \"%s\" 已匯入\n"
 
-#: g10/import.c:858
+#: g10/import.c:898
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "金鑰 %s: 跟我們的副本不吻合\n"
 
-#: g10/import.c:875
-#: g10/import.c:1279
+#: g10/import.c:915 g10/import.c:1324
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "金鑰 %s: 無法定址原始的金鑰區塊: %s\n"
 
-#: g10/import.c:883
-#: g10/import.c:1286
+#: g10/import.c:923 g10/import.c:1331
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "金鑰 %s: 無法讀取原始的金鑰區塊: %s\n"
 
-#: g10/import.c:920
+#: g10/import.c:965
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "金鑰 %s: \"%s\" 1 個新的使用者 ID\n"
 
-#: g10/import.c:923
+#: g10/import.c:968
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "金鑰 %s: \"%s\" %d 個新的使用者 ID\n"
 
-#: g10/import.c:926
+#: g10/import.c:971
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "金鑰 %s: \"%s\" 1 份新的簽章\n"
 
-#: g10/import.c:929
+#: g10/import.c:974
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "金鑰 %s: \"%s\" %d 份新的簽章\n"
 
-#: g10/import.c:932
+#: g10/import.c:977
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "金鑰 %s: \"%s\" 1 把新的子鑰\n"
 
-#: g10/import.c:935
+#: g10/import.c:980
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "金鑰 %s: \"%s\" %d 把新的子鑰\n"
 
-#: g10/import.c:938
+#: g10/import.c:983
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:941
+#: g10/import.c:986
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 份簽章\n"
 
-#: g10/import.c:944
+#: g10/import.c:989
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:947
+#: g10/import.c:992
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "金鑰 %s: \"%s\" 已清除 %d 個使用者 ID\n"
 
-#: g10/import.c:971
+#: g10/import.c:1016
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "金鑰 %s: \"%s\" 未改變\n"
 
-#: g10/import.c:1143
+#: g10/import.c:1188
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "金鑰 %s: 私鑰使用了無效的 %d 編密法 - 已跳過\n"
 
-#: g10/import.c:1154
+#: g10/import.c:1199
 msgid "importing secret keys not allowed\n"
 msgstr "未允許匯入私鑰\n"
 
-#: g10/import.c:1171
-#: g10/import.c:2446
+#: g10/import.c:1216 g10/import.c:2512
 #, c-format
 msgid "no default secret keyring: %s\n"
 msgstr "沒有預設的私鑰鑰匙圈: %s\n"
 
-#: g10/import.c:1182
+#: g10/import.c:1227
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "金鑰 %s: 私鑰已匯入\n"
 
-#: g10/import.c:1212
+#: g10/import.c:1257
 #, c-format
 msgid "key %s: already in secret keyring\n"
 msgstr "金鑰 %s: 已在私鑰鑰匙圈之中了\n"
 
-#: g10/import.c:1222
+#: g10/import.c:1267
 #, c-format
 msgid "key %s: secret key not found: %s\n"
 msgstr "金鑰 %s: 找不到私鑰: %s\n"
 
-#: g10/import.c:1254
+#: g10/import.c:1299
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "金鑰 %s: 沒有公鑰 - 無法套用撤銷憑證\n"
 
-#: g10/import.c:1297
+#: g10/import.c:1342
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已駁回\n"
 
-#: g10/import.c:1329
+#: g10/import.c:1374
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "金鑰 %s: \"%s\" 撤銷憑證已匯入\n"
 
-#: g10/import.c:1398
+#: g10/import.c:1450
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "金鑰 %s: 簽章沒有使用者 ID\n"
 
-#: g10/import.c:1413
+#: g10/import.c:1467
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 用了未支援的公鑰演算法\n"
 
-#: g10/import.c:1415
+#: g10/import.c:1469
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 的自我簽章無效\n"
 
-#: g10/import.c:1433
-#, c-format
-msgid "key %s: no subkey for key binding\n"
-msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
-
-#: g10/import.c:1444
-#: g10/import.c:1494
+#: g10/import.c:1486 g10/import.c:1512 g10/import.c:1563
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "金鑰 %s: 未支援的公鑰演算法\n"
 
-#: g10/import.c:1446
+#: g10/import.c:1487
+#, fuzzy, c-format
+msgid "key %s: invalid direct key signature\n"
+msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
+
+#: g10/import.c:1501
+#, c-format
+msgid "key %s: no subkey for key binding\n"
+msgstr "金鑰 %s: 沒有可供附帶的子鑰\n"
+
+#: g10/import.c:1514
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "金鑰 %s: 無效的附帶子鑰\n"
 
-#: g10/import.c:1461
+#: g10/import.c:1530
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "金鑰 %s: 多重附帶子鑰已移除\n"
 
-#: g10/import.c:1483
+#: g10/import.c:1552
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "金鑰 %s: 沒有子鑰可供金鑰撤銷\n"
 
-#: g10/import.c:1496
+#: g10/import.c:1565
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "金鑰 %s: 無效的子鑰撤銷\n"
 
-#: g10/import.c:1511
+#: g10/import.c:1580
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "金鑰 %s: 多重子鑰撤銷已移除\n"
 
-#: g10/import.c:1555
+#: g10/import.c:1621
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "金鑰 %s: 使用者 ID \"%s\" 已跳過\n"
 
-#: g10/import.c:1576
+#: g10/import.c:1642
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "金鑰 %s: 子鑰已跳過\n"
@@ -3289,65 +3056,65 @@ msgstr "金鑰 %s: 子鑰已跳過\n"
 #  * to import non-exportable signature when we have the
 #  * the secret key used to create this signature - it
 #  * seems that this makes sense
-#: g10/import.c:1603
+#: g10/import.c:1669
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "金鑰 %s: 不可匯出的簽章 (等級 0x%02X) - 已跳過\n"
 
-#: g10/import.c:1613
+#: g10/import.c:1679
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "金鑰 %s: 撤銷憑證在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1630
+#: g10/import.c:1696
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "金鑰 %s: 無效的撤銷憑證: %s - 已跳過\n"
 
-#: g10/import.c:1644
+#: g10/import.c:1710
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "金鑰 %s: 子鑰簽章在錯誤的地方 - 已跳過\n"
 
-#: g10/import.c:1652
+#: g10/import.c:1718
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "金鑰 %s: 非預期的簽章等級 (0x%02X) - 已跳過\n"
 
-#: g10/import.c:1781
+#: g10/import.c:1847
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "金鑰 %s: 偵測到重複的使用者 ID - 已合併\n"
 
-#: g10/import.c:1843
+#: g10/import.c:1909
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 正在取回撤銷金鑰 %s\n"
 
-#: g10/import.c:1857
+#: g10/import.c:1923
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告: 金鑰 %s 可能被撤銷了: 撤銷金鑰 %s 未出現.\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1982
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "金鑰 %s: 已新增 \"%s\" 撤銷憑證\n"
 
-#: g10/import.c:1950
+#: g10/import.c:2016
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "金鑰 %s: 已新增直接金鑰簽章\n"
 
-#: g10/import.c:2351
+#: g10/import.c:2417
 msgid "NOTE: a key's S/N does not match the card's one\n"
 msgstr "請注意: 金鑰的序號 (S/N) 與卡片上的並不一致\n"
 
-#: g10/import.c:2359
+#: g10/import.c:2425
 msgid "NOTE: primary key is online and stored on card\n"
 msgstr "請注意: 主鑰在線上且已存放於卡片上了\n"
 
-#: g10/import.c:2361
+#: g10/import.c:2427
 msgid "NOTE: secondary key is online and stored on card\n"
 msgstr "請注意: 子鑰在線上且已存放於卡片上了\n"
 
@@ -3361,8 +3128,7 @@ msgstr "建立 `%s' 鑰匙圈時出錯: %s\n"
 msgid "keyring `%s' created\n"
 msgstr "`%s' 鑰匙圈已建立\n"
 
-#: g10/keydb.c:333
-#: g10/keydb.c:336
+#: g10/keydb.c:333 g10/keydb.c:336
 #, c-format
 msgid "keyblock resource `%s': %s\n"
 msgstr "`%s' 金鑰區塊資源: %s\n"
@@ -3380,35 +3146,29 @@ msgstr "[撤銷]"
 msgid "[self-signature]"
 msgstr "[自我簽章]"
 
-#: g10/keyedit.c:344
-#: g10/keylist.c:396
+#: g10/keyedit.c:344 g10/keylist.c:396
 msgid "1 bad signature\n"
 msgstr "1 份損壞的簽章\n"
 
-#: g10/keyedit.c:346
-#: g10/keylist.c:398
+#: g10/keyedit.c:346 g10/keylist.c:398
 #, c-format
 msgid "%d bad signatures\n"
 msgstr "%d 份損壞的簽章\n"
 
-#: g10/keyedit.c:348
-#: g10/keylist.c:400
+#: g10/keyedit.c:348 g10/keylist.c:400
 msgid "1 signature not checked due to a missing key\n"
 msgstr "有 1 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:350
-#: g10/keylist.c:402
+#: g10/keyedit.c:350 g10/keylist.c:402
 #, c-format
 msgid "%d signatures not checked due to missing keys\n"
 msgstr "有 %d 份簽章因為遺失金鑰而未被檢查\n"
 
-#: g10/keyedit.c:352
-#: g10/keylist.c:404
+#: g10/keyedit.c:352 g10/keylist.c:404
 msgid "1 signature not checked due to an error\n"
 msgstr "有 1 份簽章因錯誤而未被檢查\n"
 
-#: g10/keyedit.c:354
-#: g10/keylist.c:406
+#: g10/keyedit.c:354 g10/keylist.c:406
 #, c-format
 msgid "%d signatures not checked due to errors\n"
 msgstr "有 %d 份簽章因錯誤而未被檢查\n"
@@ -3422,23 +3182,22 @@ msgstr "偵測到 1 個沒有有效自我簽章的使用者 ID\n"
 msgid "%d user IDs without valid self-signatures detected\n"
 msgstr "偵測到 %d 個沒有有效自我簽章的使用者 ID\n"
 
-#: g10/keyedit.c:414
-#: g10/pkclist.c:262
+#: g10/keyedit.c:414 g10/pkclist.c:262
 msgid ""
-"Please decide how far you trust this user to correctly verify other users' keys\n"
-"(by looking at passports, checking fingerprints from different sources, etc.)\n"
+"Please decide how far you trust this user to correctly verify other users' "
+"keys\n"
+"(by looking at passports, checking fingerprints from different sources, "
+"etc.)\n"
 msgstr ""
 "請判斷你有多信任這位使用者確實驗證其他使用者的金鑰\n"
 "(像是查對身份證, 或從不同的來源檢查指紋等...）的能力\n"
 
-#: g10/keyedit.c:418
-#: g10/pkclist.c:274
+#: g10/keyedit.c:418 g10/pkclist.c:274
 #, c-format
 msgid "  %d = I trust marginally\n"
 msgstr "  %d = 我勉強信任\n"
 
-#: g10/keyedit.c:419
-#: g10/pkclist.c:276
+#: g10/keyedit.c:419 g10/pkclist.c:276
 #, c-format
 msgid "  %d = I trust fully\n"
 msgstr "  %d = 我完全信任\n"
@@ -3462,20 +3221,13 @@ msgstr "請輸入約束此簽章的網域, 若無請直接按下 [Enter].\n"
 msgid "User ID \"%s\" is revoked."
 msgstr "使用者 ID \"%s\" 已撤銷."
 
-#: g10/keyedit.c:607
-#: g10/keyedit.c:635
-#: g10/keyedit.c:662
-#: g10/keyedit.c:830
-#: g10/keyedit.c:895
-#: g10/keyedit.c:1783
+#: g10/keyedit.c:607 g10/keyedit.c:635 g10/keyedit.c:662 g10/keyedit.c:830
+#: g10/keyedit.c:895 g10/keyedit.c:1785
 msgid "Are you sure you still want to sign it? (y/N) "
 msgstr "你仍然想要簽署它嗎? (y/N) "
 
-#: g10/keyedit.c:621
-#: g10/keyedit.c:649
-#: g10/keyedit.c:676
-#: g10/keyedit.c:836
-#: g10/keyedit.c:1789
+#: g10/keyedit.c:621 g10/keyedit.c:649 g10/keyedit.c:676 g10/keyedit.c:836
+#: g10/keyedit.c:1791
 msgid "  Unable to sign.\n"
 msgstr "  無法簽署.\n"
 
@@ -3570,7 +3322,9 @@ msgid "Do you want your signature to expire at the same time? (Y/n) "
 msgstr "你想要讓你的簽章也在同一個時候過期嗎? (Y/n) "
 
 #: g10/keyedit.c:888
-msgid "You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 mode.\n"
+msgid ""
+"You may not make an OpenPGP signature on a PGP 2.x key while in --pgp2 "
+"mode.\n"
 msgstr "你不能在 --pgp2 模式下, 拿 PGP 2.x 金鑰做出 OpenPGP 簽章.\n"
 
 #: g10/keyedit.c:890
@@ -3579,7 +3333,8 @@ msgstr "這會讓這把金鑰在 PGP 2.x 模式下無法使用.\n"
 
 #: g10/keyedit.c:915
 msgid ""
-"How carefully have you verified the key you are about to sign actually belongs\n"
+"How carefully have you verified the key you are about to sign actually "
+"belongs\n"
 "to the person named above?  If you don't know what to answer, enter \"0\".\n"
 msgstr ""
 "你有多謹慎檢查正要簽署的金鑰確實屬於上面那個人的名字呢?\n"
@@ -3654,12 +3409,8 @@ msgstr "我非常小心地檢查過這把金鑰了.\n"
 msgid "Really sign? (y/N) "
 msgstr "真的要簽署嗎? (y/N)"
 
-#: g10/keyedit.c:1066
-#: g10/keyedit.c:4965
-#: g10/keyedit.c:5056
-#: g10/keyedit.c:5120
-#: g10/keyedit.c:5181
-#: g10/sign.c:316
+#: g10/keyedit.c:1066 g10/keyedit.c:4966 g10/keyedit.c:5057 g10/keyedit.c:5121
+#: g10/keyedit.c:5182 g10/sign.c:316
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "簽署時失敗: %s\n"
@@ -3668,24 +3419,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:3774
+#: g10/keyedit.c:1142 g10/keygen.c:3774
 msgid "This key is not protected.\n"
 msgstr "這把金鑰未被保護.\n"
 
-#: g10/keyedit.c:1146
-#: g10/keygen.c:3761
-#: g10/revoke.c:536
+#: g10/keyedit.c:1146 g10/keygen.c:3761 g10/revoke.c:536
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主鑰的私鑰部分無法取用.\n"
 
-#: g10/keyedit.c:1150
-#: g10/keygen.c:3777
+#: g10/keyedit.c:1150 g10/keygen.c:3777
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主鑰的私鑰部分存放於卡上.\n"
 
-#: g10/keyedit.c:1156
-#: g10/keygen.c:3781
+#: g10/keyedit.c:1156 g10/keygen.c:3781
 msgid "Key is protected.\n"
 msgstr "金鑰已保護.\n"
 
@@ -3702,8 +3448,7 @@ msgstr ""
 "請輸入要給這把私鑰用的新密語.\n"
 "\n"
 
-#: g10/keyedit.c:1207
-#: g10/keygen.c:2291
+#: g10/keyedit.c:1207 g10/keygen.c:2291
 msgid "passphrase not correctly repeated; try again"
 msgstr "前後兩次輸入的密語不一致; 請再試一次"
 
@@ -3719,182 +3464,183 @@ msgstr ""
 msgid "Do you really want to do this? (y/N) "
 msgstr "你真的想要這麼做嗎? (y/N) "
 
-#: g10/keyedit.c:1296
+#: g10/keyedit.c:1298
 msgid "moving a key signature to the correct place\n"
 msgstr "正在把金鑰的簽章搬移到正確的位置去\n"
 
-#: g10/keyedit.c:1382
+#: g10/keyedit.c:1384
 msgid "save and quit"
 msgstr "儲存並離開"
 
-#: g10/keyedit.c:1385
+#: g10/keyedit.c:1387
 msgid "show key fingerprint"
 msgstr "顯示金鑰指紋"
 
-#: g10/keyedit.c:1386
+#: g10/keyedit.c:1388
 msgid "list key and user IDs"
 msgstr "列出金鑰和使用者 ID"
 
-#: g10/keyedit.c:1388
+#: g10/keyedit.c:1390
 msgid "select user ID N"
 msgstr "選擇使用者 ID N"
 
-#: g10/keyedit.c:1389
+#: g10/keyedit.c:1391
 msgid "select subkey N"
 msgstr "選擇子鑰 N"
 
-#: g10/keyedit.c:1390
+#: g10/keyedit.c:1392
 msgid "check signatures"
 msgstr "檢查簽章"
 
-#: g10/keyedit.c:1395
+#: g10/keyedit.c:1397
 msgid "sign selected user IDs [* see below for related commands]"
 msgstr "簽署所選的使用者 ID [* 請參見底下相關的註解]"
 
-#: g10/keyedit.c:1400
+#: g10/keyedit.c:1402
 msgid "sign selected user IDs locally"
 msgstr "僅在本機簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1402
+#: g10/keyedit.c:1404
 msgid "sign selected user IDs with a trust signature"
 msgstr "用信任簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1404
+#: g10/keyedit.c:1406
 msgid "sign selected user IDs with a non-revocable signature"
 msgstr "用不可撤銷的簽章來簽署所選的使用者 ID"
 
-#: g10/keyedit.c:1408
+#: g10/keyedit.c:1410
 msgid "add a user ID"
 msgstr "增加使用者 ID"
 
-#: g10/keyedit.c:1410
+#: g10/keyedit.c:1412
 msgid "add a photo ID"
 msgstr "增加照片 ID"
 
-#: g10/keyedit.c:1412
+#: g10/keyedit.c:1414
 msgid "delete selected user IDs"
 msgstr "刪除所選的使用者 ID"
 
-#: g10/keyedit.c:1417
+#: g10/keyedit.c:1419
 msgid "add a subkey"
 msgstr "增加子鑰"
 
-#: g10/keyedit.c:1421
+#: g10/keyedit.c:1423
 msgid "add a key to a smartcard"
 msgstr "將金鑰加到智慧卡"
 
-#: g10/keyedit.c:1423
+#: g10/keyedit.c:1425
 msgid "move a key to a smartcard"
 msgstr "將金鑰移動到智慧卡"
 
-#: g10/keyedit.c:1425
+#: g10/keyedit.c:1427
 msgid "move a backup key to a smartcard"
 msgstr "將備份金鑰移動到智慧卡"
 
-#: g10/keyedit.c:1429
+#: g10/keyedit.c:1431
 msgid "delete selected subkeys"
 msgstr "刪除所選的子鑰"
 
-#: g10/keyedit.c:1431
+#: g10/keyedit.c:1433
 msgid "add a revocation key"
 msgstr "增加撤銷金鑰"
 
-#: g10/keyedit.c:1433
+#: g10/keyedit.c:1435
 msgid "delete signatures from the selected user IDs"
 msgstr "從所選的使用者 ID 中刪除簽章"
 
-#: g10/keyedit.c:1435
+#: g10/keyedit.c:1437
 msgid "change the expiration date for the key or selected subkeys"
 msgstr "變更金鑰或所選子鑰的使用期限"
 
-#: g10/keyedit.c:1437
+#: g10/keyedit.c:1439
 msgid "flag the selected user ID as primary"
 msgstr "把所選的使用者 ID 標為主要"
 
-#: g10/keyedit.c:1439
+#: g10/keyedit.c:1441
 msgid "toggle between the secret and public key listings"
 msgstr "在私鑰清單和公鑰清單間切換"
 
-#: g10/keyedit.c:1442
+#: g10/keyedit.c:1444
 msgid "list preferences (expert)"
 msgstr "列出偏好 (專家模式)"
 
-#: g10/keyedit.c:1444
+#: g10/keyedit.c:1446
 msgid "list preferences (verbose)"
 msgstr "列出偏好 (囉唆模式)"
 
-#: g10/keyedit.c:1446
+#: g10/keyedit.c:1448
 msgid "set preference list for the selected user IDs"
 msgstr "設定所選使用者 ID 的偏好清單"
 
-#: g10/keyedit.c:1451
+#: g10/keyedit.c:1453
 msgid "set the preferred keyserver URL for the selected user IDs"
 msgstr "為所選的使用者 ID 設定偏好的金鑰伺服器 URL"
 
-#: g10/keyedit.c:1453
+#: g10/keyedit.c:1455
 msgid "set a notation for the selected user IDs"
 msgstr "為所選的使用者 ID 設定註記"
 
-#: g10/keyedit.c:1455
+#: g10/keyedit.c:1457
 msgid "change the passphrase"
 msgstr "更改密語"
 
-#: g10/keyedit.c:1459
+#: g10/keyedit.c:1461
 msgid "change the ownertrust"
 msgstr "更改主觀信任"
 
-#: g10/keyedit.c:1461
+#: g10/keyedit.c:1463
 msgid "revoke signatures on the selected user IDs"
 msgstr "撤銷所選使用者 ID 的簽章"
 
-#: g10/keyedit.c:1463
+#: g10/keyedit.c:1465
 msgid "revoke selected user IDs"
 msgstr "撤銷所選的使用者 ID"
 
-#: g10/keyedit.c:1468
+#: g10/keyedit.c:1470
 msgid "revoke key or selected subkeys"
 msgstr "撤銷金鑰或所選的子鑰"
 
-#: g10/keyedit.c:1469
+#: g10/keyedit.c:1471
 msgid "enable key"
 msgstr "啟用金鑰"
 
-#: g10/keyedit.c:1470
+#: g10/keyedit.c:1472
 msgid "disable key"
 msgstr "停用金鑰"
 
-#: g10/keyedit.c:1471
+#: g10/keyedit.c:1473
 msgid "show selected photo IDs"
 msgstr "顯示所選的照片 ID"
 
-#: g10/keyedit.c:1473
+#: g10/keyedit.c:1475
 msgid "compact unusable user IDs and remove unusable signatures from key"
 msgstr "從金鑰中精簡無法使用的使用者 ID 並移除無法使用的簽章"
 
-#: g10/keyedit.c:1475
+#: g10/keyedit.c:1477
 msgid "compact unusable user IDs and remove all signatures from key"
 msgstr "從金鑰中精簡無法使用的使用者 ID 並移除所有的簽章"
 
-#: g10/keyedit.c:1599
+#: g10/keyedit.c:1601
 #, c-format
 msgid "error reading secret keyblock \"%s\": %s\n"
 msgstr "讀取私鑰區塊 \"%s\" 時出錯: %s\n"
 
-#: g10/keyedit.c:1617
+#: g10/keyedit.c:1619
 msgid "Secret key is available.\n"
 msgstr "私鑰可用.\n"
 
-#: g10/keyedit.c:1700
+#: g10/keyedit.c:1702
 msgid "Need the secret key to do this.\n"
 msgstr "要有私鑰纔能這麼做.\n"
 
-#: g10/keyedit.c:1708
+#: g10/keyedit.c:1710
 msgid "Please use the command \"toggle\" first.\n"
 msgstr "請先使用 \"toggle\" 指令.\n"
 
-#: g10/keyedit.c:1727
+#: g10/keyedit.c:1729
 msgid ""
-"* The `sign' command may be prefixed with an `l' for local signatures (lsign),\n"
+"* The `sign' command may be prefixed with an `l' for local signatures "
+"(lsign),\n"
 "  a `t' for trust signatures (tsign), an `nr' for non-revocable signatures\n"
 "  (nrsign), or any combination thereof (ltsign, tnrsign, etc.).\n"
 msgstr ""
@@ -3902,249 +3648,225 @@ msgstr ""
 "  加上 `t' 的話就是信任簽章 (tsign), 加上 `nr' 的話就是不可撤銷簽章\n"
 "  (nrsign), 當然也可以任意組合這些選項 (像是 ltsign, tnrsign 等等.).\n"
 
-#: g10/keyedit.c:1777
+#: g10/keyedit.c:1779
 msgid "Key is revoked."
 msgstr "金鑰已撤銷."
 
-#: g10/keyedit.c:1796
+#: g10/keyedit.c:1798
 msgid "Really sign all user IDs? (y/N) "
 msgstr "真的要簽署所有的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1803
+#: g10/keyedit.c:1805
 msgid "Hint: Select the user IDs to sign\n"
 msgstr "提示: 選擇使用者 ID 來加以簽署\n"
 
-#: g10/keyedit.c:1812
+#: g10/keyedit.c:1814
 #, c-format
 msgid "Unknown signature type `%s'\n"
 msgstr "未知的 `%s' 簽章種類\n"
 
-#: g10/keyedit.c:1835
+#: g10/keyedit.c:1837
 #, c-format
 msgid "This command is not allowed while in %s mode.\n"
 msgstr "在 %s 模式中不允許使用這個指令.\n"
 
-#: g10/keyedit.c:1857
-#: g10/keyedit.c:1877
-#: g10/keyedit.c:2046
+#: g10/keyedit.c:1859 g10/keyedit.c:1879 g10/keyedit.c:2048
 msgid "You must select at least one user ID.\n"
 msgstr "你至少得選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:1859
+#: g10/keyedit.c:1861
 msgid "You can't delete the last user ID!\n"
 msgstr "你不能刪除最後一個使用者 ID!\n"
 
-#: g10/keyedit.c:1861
+#: g10/keyedit.c:1863
 msgid "Really remove all selected user IDs? (y/N) "
 msgstr "真的要移除所有被選擇的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:1862
+#: g10/keyedit.c:1864
 msgid "Really remove this user ID? (y/N) "
 msgstr "真的要移除這個使用者 ID 嗎? (y/N) "
 
 #. TRANSLATORS: Please take care: This is about
 #. moving the key and not about removing it.
-#: g10/keyedit.c:1915
+#: g10/keyedit.c:1917
 msgid "Really move the primary key? (y/N) "
 msgstr "真的要移動主鑰嗎? (y/N) "
 
-#: g10/keyedit.c:1927
+#: g10/keyedit.c:1929
 msgid "You must select exactly one key.\n"
 msgstr "你一定祇得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:1955
+#: g10/keyedit.c:1957
 msgid "Command expects a filename argument\n"
 msgstr "這項指令要拿一個檔名來當作引數\n"
 
-#: g10/keyedit.c:1969
+#: g10/keyedit.c:1971
 #, c-format
 msgid "Can't open `%s': %s\n"
 msgstr "無法開啟 `%s': %s\n"
 
-#: g10/keyedit.c:1986
+#: g10/keyedit.c:1988
 #, c-format
 msgid "Error reading backup key from `%s': %s\n"
 msgstr "從 `%s' 讀取備份金鑰時出錯: %s\n"
 
-#: g10/keyedit.c:2010
+#: g10/keyedit.c:2012
 msgid "You must select at least one key.\n"
 msgstr "你至少得選擇一把金鑰.\n"
 
-#: g10/keyedit.c:2013
+#: g10/keyedit.c:2015
 msgid "Do you really want to delete the selected keys? (y/N) "
 msgstr "你真的想要刪除所選的金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2014
+#: g10/keyedit.c:2016
 msgid "Do you really want to delete this key? (y/N) "
 msgstr "你真的想要刪除這把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2049
+#: g10/keyedit.c:2051
 msgid "Really revoke all selected user IDs? (y/N) "
 msgstr "真的要撤銷所有所選的使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2050
+#: g10/keyedit.c:2052
 msgid "Really revoke this user ID? (y/N) "
 msgstr "真的要撤銷這個使用者 ID 嗎? (y/N) "
 
-#: g10/keyedit.c:2068
+#: g10/keyedit.c:2070
 msgid "Do you really want to revoke the entire key? (y/N) "
 msgstr "你真的想要撤銷這整把金鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2079
+#: g10/keyedit.c:2081
 msgid "Do you really want to revoke the selected subkeys? (y/N) "
 msgstr "你真的想要撤銷所選的子鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2081
+#: g10/keyedit.c:2083
 msgid "Do you really want to revoke this subkey? (y/N) "
 msgstr "你真的想要撤銷這把子鑰嗎? (y/N) "
 
-#: g10/keyedit.c:2131
+#: g10/keyedit.c:2133
 msgid "Owner trust may not be set while using a user provided trust database\n"
 msgstr "使用使用者所提供的信任資料庫時可能無法設定主觀信任\n"
 
-#: g10/keyedit.c:2173
+#: g10/keyedit.c:2175
 msgid "Set preference list to:\n"
 msgstr "設定偏好清單至:\n"
 
-#: g10/keyedit.c:2179
+#: g10/keyedit.c:2181
 msgid "Really update the preferences for the selected user IDs? (y/N) "
 msgstr "真的要更新所選使用者 ID 的偏好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2181
+#: g10/keyedit.c:2183
 msgid "Really update the preferences? (y/N) "
 msgstr "真的要更新偏好設定嗎? (y/N) "
 
-#: g10/keyedit.c:2251
+#: g10/keyedit.c:2253
 msgid "Save changes? (y/N) "
 msgstr "要儲存變更嗎? (y/N) "
 
-#: g10/keyedit.c:2254
+#: g10/keyedit.c:2256
 msgid "Quit without saving? (y/N) "
 msgstr "要不儲存就離開嗎? (y/N) "
 
-#: g10/keyedit.c:2264
+#: g10/keyedit.c:2266
 #, c-format
 msgid "update failed: %s\n"
 msgstr "更新失敗: %s\n"
 
-#: g10/keyedit.c:2271
-#: g10/keyedit.c:2352
+#: g10/keyedit.c:2273 g10/keyedit.c:2351
 #, c-format
 msgid "update secret failed: %s\n"
 msgstr "更新私鑰失敗: %s\n"
 
-#: g10/keyedit.c:2278
+#: g10/keyedit.c:2280
 msgid "Key not changed so no update needed.\n"
 msgstr "金鑰沒有變更所以不需要更新.\n"
 
-#: g10/keyedit.c:2445
+#: g10/keyedit.c:2446
 msgid "Digest: "
 msgstr "摘要: "
 
-#: g10/keyedit.c:2496
+#: g10/keyedit.c:2497
 msgid "Features: "
 msgstr "特點: "
 
-#: g10/keyedit.c:2507
+#: g10/keyedit.c:2508
 msgid "Keyserver no-modify"
 msgstr "金鑰伺服器無修改"
 
-#: g10/keyedit.c:2522
-#: g10/keylist.c:314
+#: g10/keyedit.c:2523 g10/keylist.c:314
 msgid "Preferred keyserver: "
 msgstr "偏好的金鑰伺服器: "
 
-#: g10/keyedit.c:2530
-#: g10/keyedit.c:2531
+#: g10/keyedit.c:2531 g10/keyedit.c:2532
 msgid "Notations: "
 msgstr "註記: "
 
-#: g10/keyedit.c:2752
+#: g10/keyedit.c:2753
 msgid "There are no preferences on a PGP 2.x-style user ID.\n"
 msgstr "PGP 2.x 型態的使用者 ID 沒有偏好設定.\n"
 
-#: g10/keyedit.c:2811
+#: g10/keyedit.c:2812
 #, c-format
 msgid "This key was revoked on %s by %s key %s\n"
 msgstr "這把金鑰已經在 %s 時被 %s 金鑰 %s 所撤銷\n"
 
-#: g10/keyedit.c:2832
+#: g10/keyedit.c:2833
 #, c-format
 msgid "This key may be revoked by %s key %s"
 msgstr "這把金鑰可能被 %s 金鑰 %s 所撤銷"
 
-#: g10/keyedit.c:2838
+#: g10/keyedit.c:2839
 msgid "(sensitive)"
 msgstr "(機密)"
 
-#: g10/keyedit.c:2854
-#: g10/keyedit.c:2910
-#: g10/keyedit.c:2971
-#: g10/keyedit.c:2986
-#: g10/keylist.c:200
-#: g10/keyserver.c:532
+#: g10/keyedit.c:2855 g10/keyedit.c:2911 g10/keyedit.c:2972 g10/keyedit.c:2987
+#: g10/keylist.c:200 g10/keyserver.c:532
 #, c-format
 msgid "created: %s"
 msgstr "建立: %s"
 
-#: g10/keyedit.c:2857
-#: g10/keylist.c:832
-#: g10/keylist.c:926
-#: g10/mainproc.c:996
+#: g10/keyedit.c:2858 g10/keylist.c:832 g10/keylist.c:926 g10/mainproc.c:996
 #, c-format
 msgid "revoked: %s"
 msgstr "撤銷: %s"
 
 #  of subkey
-#: g10/keyedit.c:2859
-#: g10/keylist.c:803
-#: g10/keylist.c:838
-#: g10/keylist.c:932
+#: g10/keyedit.c:2860 g10/keylist.c:803 g10/keylist.c:838 g10/keylist.c:932
 #, c-format
 msgid "expired: %s"
 msgstr "過期: %s"
 
 #  of subkey
-#: g10/keyedit.c:2861
-#: g10/keyedit.c:2912
-#: g10/keyedit.c:2973
-#: g10/keyedit.c:2988
-#: g10/keylist.c:202
-#: g10/keylist.c:809
-#: g10/keylist.c:844
-#: g10/keylist.c:938
-#: g10/keylist.c:959
-#: g10/keyserver.c:538
-#: g10/mainproc.c:1002
+#: g10/keyedit.c:2862 g10/keyedit.c:2913 g10/keyedit.c:2974 g10/keyedit.c:2989
+#: g10/keylist.c:202 g10/keylist.c:809 g10/keylist.c:844 g10/keylist.c:938
+#: g10/keylist.c:959 g10/keyserver.c:538 g10/mainproc.c:1002
 #, c-format
 msgid "expires: %s"
 msgstr "到期: %s"
 
-#: g10/keyedit.c:2863
+#: g10/keyedit.c:2864
 #, c-format
 msgid "usage: %s"
 msgstr "用途: %s"
 
-#: g10/keyedit.c:2878
+#: g10/keyedit.c:2879
 #, c-format
 msgid "trust: %s"
 msgstr "信任: %s"
 
-#: g10/keyedit.c:2882
+#: g10/keyedit.c:2883
 #, c-format
 msgid "validity: %s"
 msgstr "有效性: %s"
 
-#: g10/keyedit.c:2889
+#: g10/keyedit.c:2890
 msgid "This key has been disabled"
 msgstr "這把金鑰已經停用了"
 
-#: g10/keyedit.c:2917
-#: g10/keylist.c:206
+#: g10/keyedit.c:2918 g10/keylist.c:206
 msgid "card-no: "
 msgstr "卡片編號: "
 
-#: g10/keyedit.c:2941
+#: g10/keyedit.c:2942
 msgid ""
 "Please note that the shown key validity is not necessarily correct\n"
 "unless you restart the program.\n"
@@ -4152,25 +3874,17 @@ msgstr ""
 "請注意顯示出來的金鑰有效性不需要更正,\n"
 "除非你重新執行程式.\n"
 
-#: g10/keyedit.c:3005
-#: g10/keyedit.c:3351
-#: g10/keyserver.c:542
-#: g10/mainproc.c:1849
-#: g10/trustdb.c:1200
-#: g10/trustdb.c:1728
+#: g10/keyedit.c:3006 g10/keyedit.c:3352 g10/keyserver.c:542
+#: g10/mainproc.c:1849 g10/trustdb.c:1200 g10/trustdb.c:1728
 msgid "revoked"
 msgstr "已撤銷"
 
-#: g10/keyedit.c:3007
-#: g10/keyedit.c:3353
-#: g10/keyserver.c:546
-#: g10/mainproc.c:1851
-#: g10/trustdb.c:547
-#: g10/trustdb.c:1730
+#: g10/keyedit.c:3008 g10/keyedit.c:3354 g10/keyserver.c:546
+#: g10/mainproc.c:1851 g10/trustdb.c:547 g10/trustdb.c:1730
 msgid "expired"
 msgstr "已過期"
 
-#: g10/keyedit.c:3072
+#: g10/keyedit.c:3073
 msgid ""
 "WARNING: no user ID has been marked as primary.  This command may\n"
 "              cause a different user ID to become the assumed primary.\n"
@@ -4178,285 +3892,279 @@ msgstr ""
 "警告: 沒有任何使用者 ID 被標示為主要 ID. 這項指令可能會\n"
 "      導致不同的使用者 ID 被當成主要 ID.\n"
 
-#: g10/keyedit.c:3133
+#: g10/keyedit.c:3134
 msgid ""
-"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some versions\n"
+"WARNING: This is a PGP2-style key.  Adding a photo ID may cause some "
+"versions\n"
 "         of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加照片 ID 可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3138
-#: g10/keyedit.c:3473
+#: g10/keyedit.c:3139 g10/keyedit.c:3474
 msgid "Are you sure you still want to add it? (y/N) "
 msgstr "你確定仍然想要增加嗎? (y/N) "
 
-#: g10/keyedit.c:3144
+#: g10/keyedit.c:3145
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "你不可以把照片 ID 增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3284
+#: g10/keyedit.c:3285
 msgid "Delete this good signature? (y/N/q)"
 msgstr "刪除這份完好的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3294
+#: g10/keyedit.c:3295
 msgid "Delete this invalid signature? (y/N/q)"
 msgstr "刪除這份無效的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3298
+#: g10/keyedit.c:3299
 msgid "Delete this unknown signature? (y/N/q)"
 msgstr "刪除這份未知的簽章嗎? (y/N/q)"
 
-#: g10/keyedit.c:3304
+#: g10/keyedit.c:3305
 msgid "Really delete this self-signature? (y/N)"
 msgstr "真的要刪除這份自我簽章嗎? (y/N)"
 
-#: g10/keyedit.c:3318
+#: g10/keyedit.c:3319
 #, c-format
 msgid "Deleted %d signature.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3319
+#: g10/keyedit.c:3320
 #, c-format
 msgid "Deleted %d signatures.\n"
 msgstr "已經刪除了 %d 份簽章.\n"
 
-#: g10/keyedit.c:3322
+#: g10/keyedit.c:3323
 msgid "Nothing deleted.\n"
 msgstr "沒有刪除任何東西.\n"
 
-#: g10/keyedit.c:3355
-#: g10/trustdb.c:1732
+#: g10/keyedit.c:3356 g10/trustdb.c:1732
 msgid "invalid"
 msgstr "無效"
 
-#: g10/keyedit.c:3357
+#: g10/keyedit.c:3358
 #, c-format
 msgid "User ID \"%s\" compacted: %s\n"
 msgstr "使用者 ID \"%s\" 已精簡: %s\n"
 
-#: g10/keyedit.c:3364
+#: g10/keyedit.c:3365
 #, c-format
 msgid "User ID \"%s\": %d signature removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3365
+#: g10/keyedit.c:3366
 #, c-format
 msgid "User ID \"%s\": %d signatures removed\n"
 msgstr "使用者 ID \"%s\": 已移除 %d 份簽章\n"
 
-#: g10/keyedit.c:3373
+#: g10/keyedit.c:3374
 #, c-format
 msgid "User ID \"%s\": already minimized\n"
 msgstr "使用者 ID \"%s\": 已經最小化了\n"
 
-#: g10/keyedit.c:3374
+#: g10/keyedit.c:3375
 #, c-format
 msgid "User ID \"%s\": already clean\n"
 msgstr "使用者 ID \"%s\": 已經是乾淨的了\n"
 
-#: g10/keyedit.c:3468
+#: g10/keyedit.c:3469
 msgid ""
-"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may cause\n"
+"WARNING: This is a PGP 2.x-style key.  Adding a designated revoker may "
+"cause\n"
 "         some versions of PGP to reject this key.\n"
 msgstr ""
 "警告: 這是一把 PGP2 型態的金鑰.\n"
 "      增加指定撤銷者可能會導致某些版本的 PGP 駁回這把金鑰.\n"
 
-#: g10/keyedit.c:3479
+#: g10/keyedit.c:3480
 msgid "You may not add a designated revoker to a PGP 2.x-style key.\n"
 msgstr "你不可以把指定撤銷者增加到 PGP2 型態的金鑰裡.\n"
 
-#: g10/keyedit.c:3499
+#: g10/keyedit.c:3500
 msgid "Enter the user ID of the designated revoker: "
 msgstr "輸入指定撤銷者的使用者 ID: "
 
-#: g10/keyedit.c:3524
+#: g10/keyedit.c:3525
 msgid "cannot appoint a PGP 2.x style key as a designated revoker\n"
 msgstr "無法將 PGP 2.x 型態的金鑰指派為指定撤銷者\n"
 
 #  This actually causes no harm (after all, a key that
 #  designates itself as a revoker is the same as a
 #  regular key), but it's easy enough to check.
-#: g10/keyedit.c:3539
+#: g10/keyedit.c:3540
 msgid "you cannot appoint a key as its own designated revoker\n"
 msgstr "你不能指派某把金鑰為它自己的指定撤銷者\n"
 
-#: g10/keyedit.c:3561
+#: g10/keyedit.c:3562
 msgid "this key has already been designated as a revoker\n"
 msgstr "已指定這把金鑰為撤銷者了\n"
 
-#: g10/keyedit.c:3580
+#: g10/keyedit.c:3581
 msgid "WARNING: appointing a key as a designated revoker cannot be undone!\n"
 msgstr "警告: 一旦把某把金鑰指派為指定撤銷者後, 就無法反悔了!\n"
 
-#: g10/keyedit.c:3586
-msgid "Are you sure you want to appoint this key as a designated revoker? (y/N) "
+#: g10/keyedit.c:3587
+msgid ""
+"Are you sure you want to appoint this key as a designated revoker? (y/N) "
 msgstr "你確定要指派這把金鑰為指定撤銷者嗎? (y/N) "
 
-#: g10/keyedit.c:3647
+#: g10/keyedit.c:3648
 msgid "Please remove selections from the secret keys.\n"
 msgstr "請從私鑰中移除選擇.\n"
 
-#: g10/keyedit.c:3653
+#: g10/keyedit.c:3654
 msgid "Please select at most one subkey.\n"
 msgstr "請至多選擇一把子鑰.\n"
 
-#: g10/keyedit.c:3657
+#: g10/keyedit.c:3658
 msgid "Changing expiration time for a subkey.\n"
 msgstr "正在變更子鑰的使用期限.\n"
 
-#: g10/keyedit.c:3660
+#: g10/keyedit.c:3661
 msgid "Changing expiration time for the primary key.\n"
 msgstr "正在變更主鑰的使用期限.\n"
 
-#: g10/keyedit.c:3706
+#: g10/keyedit.c:3707
 msgid "You can't change the expiration date of a v3 key\n"
 msgstr "你不能變更 v3 金鑰的使用期限\n"
 
-#: g10/keyedit.c:3722
+#: g10/keyedit.c:3723
 msgid "No corresponding signature in secret ring\n"
 msgstr "在私鑰圈裡沒有一致的簽章\n"
 
-#: g10/keyedit.c:3800
+#: g10/keyedit.c:3801
 #, c-format
 msgid "signing subkey %s is already cross-certified\n"
 msgstr "簽署子鑰 %s 已經交叉認證過了\n"
 
-#: g10/keyedit.c:3806
+#: g10/keyedit.c:3807
 #, c-format
 msgid "subkey %s does not sign and so does not need to be cross-certified\n"
 msgstr "子鑰 %s 不做簽署之用, 因此無須交叉驗證\n"
 
-#: g10/keyedit.c:3969
+#: g10/keyedit.c:3970
 msgid "Please select exactly one user ID.\n"
 msgstr "請祇選擇一個使用者 ID.\n"
 
-#: g10/keyedit.c:4008
-#: g10/keyedit.c:4118
-#: g10/keyedit.c:4238
-#: g10/keyedit.c:4379
+#: g10/keyedit.c:4009 g10/keyedit.c:4119 g10/keyedit.c:4239 g10/keyedit.c:4380
 #, c-format
 msgid "skipping v3 self-signature on user ID \"%s\"\n"
 msgstr "正在跳過使用者 ID \"%s\" 的 v3 自我簽章\n"
 
-#: g10/keyedit.c:4179
+#: g10/keyedit.c:4180
 msgid "Enter your preferred keyserver URL: "
 msgstr "請輸入你的偏好金鑰伺服器 URL: "
 
-#: g10/keyedit.c:4259
+#: g10/keyedit.c:4260
 msgid "Are you sure you want to replace it? (y/N) "
 msgstr "你確定要取代它嗎？ (y/N) "
 
-#: g10/keyedit.c:4260
+#: g10/keyedit.c:4261
 msgid "Are you sure you want to delete it? (y/N) "
 msgstr "你確定要刪除它嗎？ (y/N) "
 
-#: g10/keyedit.c:4322
+#: g10/keyedit.c:4323
 msgid "Enter the notation: "
 msgstr "請輸入註記: "
 
-#: g10/keyedit.c:4471
+#: g10/keyedit.c:4472
 msgid "Proceed? (y/N) "
 msgstr "是否繼續? (y/N) "
 
-#: g10/keyedit.c:4543
+#: g10/keyedit.c:4544
 #, c-format
 msgid "No user ID with index %d\n"
 msgstr "索引 %d 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4604
+#: g10/keyedit.c:4605
 #, c-format
 msgid "No user ID with hash %s\n"
 msgstr "雜湊 %s 沒有對應到使用者 ID\n"
 
-#: g10/keyedit.c:4639
+#: g10/keyedit.c:4640
 #, c-format
 msgid "No subkey with index %d\n"
 msgstr "索引 %d 沒有對應到子鑰\n"
 
-#: g10/keyedit.c:4774
+#: g10/keyedit.c:4775
 #, c-format
 msgid "user ID: \"%s\"\n"
 msgstr "使用者 ID: \"%s\"\n"
 
-#: g10/keyedit.c:4777
-#: g10/keyedit.c:4871
-#: g10/keyedit.c:4914
+#: g10/keyedit.c:4778 g10/keyedit.c:4872 g10/keyedit.c:4915
 #, c-format
 msgid "signed by your key %s on %s%s%s\n"
 msgstr "已被你的金鑰 %s 於 %s%s%s 所簽署\n"
 
-#: g10/keyedit.c:4779
-#: g10/keyedit.c:4873
-#: g10/keyedit.c:4916
+#: g10/keyedit.c:4780 g10/keyedit.c:4874 g10/keyedit.c:4917
 msgid " (non-exportable)"
 msgstr " (不可匯出)"
 
-#: g10/keyedit.c:4783
+#: g10/keyedit.c:4784
 #, c-format
 msgid "This signature expired on %s.\n"
 msgstr "這份簽章已經在 %s 過期了.\n"
 
-#: g10/keyedit.c:4787
+#: g10/keyedit.c:4788
 msgid "Are you sure you still want to revoke it? (y/N) "
 msgstr "你確定仍然想要撤銷它嗎? (y/N) "
 
-#: g10/keyedit.c:4791
+#: g10/keyedit.c:4792
 msgid "Create a revocation certificate for this signature? (y/N) "
 msgstr "要為這份簽章建立一份撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4842
+#: g10/keyedit.c:4843
 msgid "Not signed by you.\n"
 msgstr "並非由你所簽署.\n"
 
-#: g10/keyedit.c:4848
+#: g10/keyedit.c:4849
 #, c-format
 msgid "You have signed these user IDs on key %s:\n"
 msgstr "你已經簽署了金鑰 %s 上的這些使用者 ID:\n"
 
-#: g10/keyedit.c:4874
+#: g10/keyedit.c:4875
 msgid " (non-revocable)"
 msgstr " (不可撤銷)"
 
-#: g10/keyedit.c:4881
+#: g10/keyedit.c:4882
 #, c-format
 msgid "revoked by your key %s on %s\n"
 msgstr "被你的金鑰 %s 於 %s 所撤銷了\n"
 
-#: g10/keyedit.c:4903
+#: g10/keyedit.c:4904
 msgid "You are about to revoke these signatures:\n"
 msgstr "你正要撤銷這些簽章:\n"
 
-#: g10/keyedit.c:4923
+#: g10/keyedit.c:4924
 msgid "Really create the revocation certificates? (y/N) "
 msgstr "真的要建立撤銷憑證嗎? (y/N) "
 
-#: g10/keyedit.c:4953
+#: g10/keyedit.c:4954
 msgid "no secret key\n"
 msgstr "沒有私鑰\n"
 
-#: g10/keyedit.c:5023
+#: g10/keyedit.c:5024
 #, c-format
 msgid "user ID \"%s\" is already revoked\n"
 msgstr "使用者 ID \"%s\" 已撤銷\n"
 
-#: g10/keyedit.c:5040
+#: g10/keyedit.c:5041
 #, c-format
 msgid "WARNING: a user ID signature is dated %d seconds in the future\n"
 msgstr "警告: 有一份使用者 ID 的簽章日期為 %d 秒後的未來\n"
 
-#: g10/keyedit.c:5104
+#: g10/keyedit.c:5105
 #, c-format
 msgid "Key %s is already revoked.\n"
 msgstr "金鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5166
+#: g10/keyedit.c:5167
 #, c-format
 msgid "Subkey %s is already revoked.\n"
 msgstr "子鑰 %s 已撤銷.\n"
 
-#: g10/keyedit.c:5261
+#: g10/keyedit.c:5262
 #, c-format
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在顯示 %s 照片 ID, 其尺寸為 %ld, 屬於金鑰 %s (uid %d) 的照片\n"
@@ -4495,26 +4203,21 @@ msgstr "寫入自我簽章中\n"
 msgid "writing key binding signature\n"
 msgstr "寫入附鑰簽章中\n"
 
-#: g10/keygen.c:1179
-#: g10/keygen.c:1290
-#: g10/keygen.c:1295
-#: g10/keygen.c:1441
+#: g10/keygen.c:1179 g10/keygen.c:1290 g10/keygen.c:1295 g10/keygen.c:1441
 #: g10/keygen.c:3269
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "金鑰尺寸無效; 改用 %u 位元\n"
 
-#: g10/keygen.c:1185
-#: g10/keygen.c:1301
-#: g10/keygen.c:1309
-#: g10/keygen.c:1447
+#: g10/keygen.c:1185 g10/keygen.c:1301 g10/keygen.c:1309 g10/keygen.c:1447
 #: g10/keygen.c:3275
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "金鑰尺寸增大到 %u 位元\n"
 
 #: g10/keygen.c:1335
-msgid "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
+msgid ""
+"WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr "警告: 某些 OpenPGP 程式無法處理具有此摘要尺寸的 DSA 金鑰\n"
 
 #: g10/keygen.c:1558
@@ -4576,8 +4279,7 @@ msgstr "   (%c) 切換鑑定性能\n"
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/keygen.c:1686
-#: sm/certreqgen-ui.c:157
+#: g10/keygen.c:1686 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "請選擇你要使用的金鑰種類:\n"
 
@@ -4631,14 +4333,12 @@ msgstr "%s 金鑰的長度可能介於 %u 位元和 %u 位元之間.\n"
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "你的子鑰想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1823
-#: sm/certreqgen-ui.c:179
+#: g10/keygen.c:1823 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "你想要用多大的金鑰尺寸? (%u) "
 
-#: g10/keygen.c:1837
-#: sm/certreqgen-ui.c:189
+#: g10/keygen.c:1837 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "你所要求的金鑰尺寸是 %u 位元\n"
@@ -4684,8 +4384,7 @@ msgstr "金鑰的有效期限是多久? (0) "
 msgid "Signature is valid for? (%s) "
 msgstr "簽章的有效期限是多久? (%s) "
 
-#: g10/keygen.c:1982
-#: g10/keygen.c:2007
+#: g10/keygen.c:1982 g10/keygen.c:2007
 msgid "invalid value\n"
 msgstr "無效的數值\n"
 
@@ -4736,7 +4435,8 @@ msgstr ""
 #: g10/keygen.c:2078
 msgid ""
 "\n"
-"You need a user ID to identify your key; the software constructs the user ID\n"
+"You need a user ID to identify your key; the software constructs the user "
+"ID\n"
 "from the Real Name, Comment and Email Address in this form:\n"
 "    \"Heinrich Heine (Der Dichter) <[email protected]>\"\n"
 "\n"
@@ -4839,7 +4539,9 @@ msgstr ""
 "\n"
 
 #: g10/keygen.c:2276
-msgid "Please enter a passphrase to protect the off-card backup of the new encryption key."
+msgid ""
+"Please enter a passphrase to protect the off-card backup of the new "
+"encryption key."
 msgstr "請輸入密語以保護新加密金鑰的卡片外備份."
 
 #: g10/keygen.c:2292
@@ -4870,25 +4572,21 @@ msgstr ""
 "(像是敲打鍵盤, 移動滑鼠, 讀寫硬碟之類的)\n"
 "這會讓隨機數字產生器有更多的機會獲得夠多的亂數.\n"
 
-#: g10/keygen.c:3209
-#: g10/keygen.c:3236
+#: g10/keygen.c:3209 g10/keygen.c:3236
 msgid "Key generation canceled.\n"
 msgstr "金鑰產生已取消.\n"
 
-#: g10/keygen.c:3441
-#: g10/keygen.c:3611
+#: g10/keygen.c:3441 g10/keygen.c:3611
 #, c-format
 msgid "writing public key to `%s'\n"
 msgstr "正在寫入公鑰至 `%s'\n"
 
-#: g10/keygen.c:3443
-#: g10/keygen.c:3614
+#: g10/keygen.c:3443 g10/keygen.c:3614
 #, c-format
 msgid "writing secret key stub to `%s'\n"
 msgstr "正在寫入私鑰 stub 至 `%s'\n"
 
-#: g10/keygen.c:3446
-#: g10/keygen.c:3617
+#: g10/keygen.c:3446 g10/keygen.c:3617
 #, c-format
 msgid "writing secret key to `%s'\n"
 msgstr "正在寫入私鑰至 `%s'\n"
@@ -4925,34 +4623,28 @@ msgstr ""
 "請注意這把金鑰不能用於加密.  也許你會想藉由 \"--edit-key\" 指令\n"
 "來產生加密用的子鑰.\n"
 
-#: g10/keygen.c:3685
-#: g10/keygen.c:3831
-#: g10/keygen.c:3952
+#: g10/keygen.c:3685 g10/keygen.c:3831 g10/keygen.c:3952
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "產生金鑰失敗: %s\n"
 
-#: g10/keygen.c:3741
-#: g10/keygen.c:3882
-#: g10/sign.c:241
+#: g10/keygen.c:3741 g10/keygen.c:3882 g10/sign.c:241
 #, c-format
-msgid "key has been created %lu second in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3743
-#: g10/keygen.c:3884
-#: g10/sign.c:243
+#: g10/keygen.c:3743 g10/keygen.c:3884 g10/sign.c:243
 #, c-format
-msgid "key has been created %lu seconds in future (time warp or clock problem)\n"
+msgid ""
+"key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "金鑰已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
-#: g10/keygen.c:3754
-#: g10/keygen.c:3895
+#: g10/keygen.c:3754 g10/keygen.c:3895
 msgid "NOTE: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "請注意: 對 v3 金鑰製造子鑰會失去 OpenPGP 相容性\n"
 
-#: g10/keygen.c:3795
-#: g10/keygen.c:3928
+#: g10/keygen.c:3795 g10/keygen.c:3928
 msgid "Really create? (y/N) "
 msgstr "真的要建立嗎? (y/N) "
 
@@ -4971,10 +4663,7 @@ msgstr "無法建立備份檔案 `%s': %s\n"
 msgid "NOTE: backup of card key saved to `%s'\n"
 msgstr "請注意: 卡片金鑰的備份已儲存至 `%s'\n"
 
-#: g10/keyid.c:537
-#: g10/keyid.c:549
-#: g10/keyid.c:561
-#: g10/keyid.c:573
+#: g10/keyid.c:537 g10/keyid.c:549 g10/keyid.c:561 g10/keyid.c:573
 msgid "never     "
 msgstr "永遠不過期"
 
@@ -5021,8 +4710,7 @@ msgid "      Subkey fingerprint:"
 msgstr "                子鑰指紋:"
 
 #  use tty
-#: g10/keylist.c:1539
-#: g10/keylist.c:1543
+#: g10/keylist.c:1539 g10/keylist.c:1543
 msgid "      Key fingerprint ="
 msgstr "      金鑰指紋 ="
 
@@ -5114,8 +4802,7 @@ msgstr "已停用"
 msgid "Enter number(s), N)ext, or Q)uit > "
 msgstr "請輸入數字, N)下一頁, 或 Q)離開 > "
 
-#: g10/keyserver.c:831
-#: g10/keyserver.c:1458
+#: g10/keyserver.c:831 g10/keyserver.c:1458
 #, c-format
 msgid "invalid keyserver protocol (us %d!=handler %d)\n"
 msgstr "無效的金鑰伺服器協定 (我們用 %d!=經手程式 %d)\n"
@@ -5169,8 +4856,7 @@ msgstr "正在搜尋 \"%s\" 於 %s 伺服器 %s\n"
 msgid "searching for \"%s\" from %s\n"
 msgstr "正在搜尋 \"%s\" 於 %s\n"
 
-#: g10/keyserver.c:1418
-#: g10/keyserver.c:1514
+#: g10/keyserver.c:1418 g10/keyserver.c:1514
 msgid "no keyserver action!\n"
 msgstr "沒有金鑰伺服器動作!\n"
 
@@ -5183,8 +4869,7 @@ msgstr "警告: 金鑰伺服器經手程式係來自不同版本的 GnuPG (%s)\n
 msgid "keyserver did not send VERSION\n"
 msgstr "金鑰伺服器並未送出版本 (VERSION)\n"
 
-#: g10/keyserver.c:1537
-#: g10/keyserver.c:2066
+#: g10/keyserver.c:1537 g10/keyserver.c:2066
 msgid "no keyserver known (use option --keyserver)\n"
 msgstr "沒有已知的金鑰伺服器 (使用 --keyserver 選項)\n"
 
@@ -5220,8 +4905,7 @@ msgstr "金鑰伺服器內部錯誤\n"
 msgid "keyserver communications error: %s\n"
 msgstr "金鑰伺服器通訊錯誤: %s\n"
 
-#: g10/keyserver.c:1614
-#: g10/keyserver.c:1648
+#: g10/keyserver.c:1614 g10/keyserver.c:1648
 #, c-format
 msgid "\"%s\" not a key ID: skipping\n"
 msgstr "\"%s\" 並非金鑰 ID: 跳過中\n"
@@ -5280,8 +4964,7 @@ msgstr "公鑰加密過的資料: 完好的 DEK\n"
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "已用 %u 位元長的 %s 金鑰,  ID %s, 建立於 %s 所加密\n"
 
-#: g10/mainproc.c:460
-#: g10/pkclist.c:217
+#: g10/mainproc.c:460 g10/pkclist.c:217
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      \"%s\"\n"
@@ -5305,8 +4988,7 @@ msgstr "已用 %lu 個密語加密了\n"
 msgid "encrypted with 1 passphrase\n"
 msgstr "已用 1 個密語加密了\n"
 
-#: g10/mainproc.c:526
-#: g10/mainproc.c:548
+#: g10/mainproc.c:526 g10/mainproc.c:548
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 為加密過的資料\n"
@@ -5355,8 +5037,7 @@ msgstr "警告: 看到了多份明文\n"
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "獨立撤銷 - 請用 \"gpg --import\" 來套用\n"
 
-#: g10/mainproc.c:1202
-#: g10/mainproc.c:1239
+#: g10/mainproc.c:1202 g10/mainproc.c:1239
 msgid "no signature found\n"
 msgstr "找不到簽章\n"
 
@@ -5387,20 +5068,17 @@ msgstr "由 %s 建立的簽章, 使用 %s 金鑰 ID %s\n"
 msgid "Key available at: "
 msgstr "可用的金鑰於: "
 
-#: g10/mainproc.c:1755
-#: g10/mainproc.c:1803
+#: g10/mainproc.c:1755 g10/mainproc.c:1803
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "*損壞* 的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1757
-#: g10/mainproc.c:1805
+#: g10/mainproc.c:1757 g10/mainproc.c:1805
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "過期的簽章來自於 \"%s\""
 
-#: g10/mainproc.c:1759
-#: g10/mainproc.c:1807
+#: g10/mainproc.c:1759 g10/mainproc.c:1807
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的簽章來自於 \"%s\""
@@ -5437,8 +5115,7 @@ msgstr "二進制"
 msgid "textmode"
 msgstr "文字模式"
 
-#: g10/mainproc.c:1950
-#: g10/trustdb.c:546
+#: g10/mainproc.c:1950 g10/trustdb.c:546
 msgid "unknown"
 msgstr "未知"
 
@@ -5447,14 +5124,13 @@ msgstr "未知"
 msgid "Can't check signature: %s\n"
 msgstr "無法檢查簽章: %s\n"
 
-#: g10/mainproc.c:2054
-#: g10/mainproc.c:2070
-#: g10/mainproc.c:2166
+#: g10/mainproc.c:2054 g10/mainproc.c:2070 g10/mainproc.c:2166
 msgid "not a detached signature\n"
 msgstr "不是一份分離的簽章\n"
 
 #: g10/mainproc.c:2097
-msgid "WARNING: multiple signatures detected.  Only the first will be checked.\n"
+msgid ""
+"WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告: 偵測到多重簽章. 祇有第一個簽章纔會被核選.\n"
 
 #: g10/mainproc.c:2105
@@ -5470,9 +5146,7 @@ msgstr "舊型 (PGP 2.x) 簽章\n"
 msgid "invalid root packet detected in proc_tree()\n"
 msgstr "在 proc_tree() 中偵測到無效的 root 封包\n"
 
-#: g10/misc.c:109
-#: g10/misc.c:139
-#: g10/misc.c:215
+#: g10/misc.c:109 g10/misc.c:139 g10/misc.c:215
 #, c-format
 msgid "fstat of `%s' failed in %s: %s\n"
 msgstr "`%s' 的 fstat 失敗於 %s: %s\n"
@@ -5510,9 +5184,7 @@ msgstr "警告: 已不建議使用 %s 摘要演算法\n"
 msgid "the IDEA cipher plugin is not present\n"
 msgstr "IDEA 編密法外掛模組不存在\n"
 
-#: g10/misc.c:504
-#: g10/sig-check.c:107
-#: jnlib/utf8conv.c:87
+#: g10/misc.c:504 g10/sig-check.c:107 jnlib/utf8conv.c:87
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "請參考 %s 上進一步的資訊\n"
@@ -5613,24 +5285,21 @@ msgstr "警告: 在 `%s' 裡的選項於這次執行期間並沒有被啟用\n"
 msgid "can't handle public key algorithm %d\n"
 msgstr "無法操作 %d 公開金鑰演算法\n"
 
-#: g10/parse-packet.c:818
+#: g10/parse-packet.c:822
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告: 可能並不安全的對稱式加密階段金鑰\n"
 
-#: g10/parse-packet.c:1269
+#: g10/parse-packet.c:1273
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 類別的子封包設定了關鍵位元\n"
 
-#: g10/passphrase.c:75
-#: g10/passphrase.c:418
-#: g10/passphrase.c:481
+#: g10/passphrase.c:75 g10/passphrase.c:418 g10/passphrase.c:481
 #, c-format
 msgid "problem with the agent: %s\n"
 msgstr "代理程式的問題: %s\n"
 
-#: g10/passphrase.c:344
-#: g10/passphrase.c:613
+#: g10/passphrase.c:344 g10/passphrase.c:613
 #, c-format
 msgid " (main key ID %s)"
 msgstr " (主要金鑰 ID %s)"
@@ -5638,7 +5307,8 @@ msgstr " (主要金鑰 ID %s)"
 #: g10/passphrase.c:358
 #, c-format
 msgid ""
-"Please enter the passphrase to unlock the secret key for the OpenPGP certificate:\n"
+"Please enter the passphrase to unlock the secret key for the OpenPGP "
+"certificate:\n"
 "\"%.*s\"\n"
 "%u-bit %s key, ID %s,\n"
 "created %s%s.\n"
@@ -5720,28 +5390,23 @@ msgstr "這張照片正確嗎? (y/N/q) "
 msgid "unable to display photo ID!\n"
 msgstr "無法顯示照片 ID!\n"
 
-#: g10/pkclist.c:60
-#: g10/revoke.c:621
+#: g10/pkclist.c:60 g10/revoke.c:621
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/pkclist.c:62
-#: g10/revoke.c:623
+#: g10/pkclist.c:62 g10/revoke.c:623
 msgid "Key is superseded"
 msgstr "金鑰被代換了"
 
-#: g10/pkclist.c:64
-#: g10/revoke.c:622
+#: g10/pkclist.c:64 g10/revoke.c:622
 msgid "Key has been compromised"
 msgstr "金鑰已經被洩漏了"
 
-#: g10/pkclist.c:66
-#: g10/revoke.c:624
+#: g10/pkclist.c:66 g10/revoke.c:624
 msgid "Key is no longer used"
 msgstr "金鑰不再被使用了"
 
-#: g10/pkclist.c:68
-#: g10/revoke.c:625
+#: g10/pkclist.c:68 g10/revoke.c:625
 msgid "User ID is no longer valid"
 msgstr "使用者 ID 不再有效了"
 
@@ -5768,7 +5433,8 @@ msgid "  aka \"%s\"\n"
 msgstr "  亦即 \"%s\"\n"
 
 #: g10/pkclist.c:255
-msgid "How much do you trust that this key actually belongs to the named user?\n"
+msgid ""
+"How much do you trust that this key actually belongs to the named user?\n"
 msgstr "你有多信任這把金鑰真的屬於叫這個名字的使用者?\n"
 
 #: g10/pkclist.c:270
@@ -5807,8 +5473,7 @@ msgstr ""
 "這把金鑰的最小信任等級為: %s\n"
 "\n"
 
-#: g10/pkclist.c:298
-#: g10/revoke.c:650
+#: g10/pkclist.c:298 g10/revoke.c:650
 msgid "Your decision? "
 msgstr "你的決定是甚麼? "
 
@@ -5907,7 +5572,8 @@ msgid "WARNING: This key is not certified with a trusted signature!\n"
 msgstr "警告: 這把金鑰並非以受信任的簽章所認證!\n"
 
 #: g10/pkclist.c:615
-msgid "         There is no indication that the signature belongs to the owner.\n"
+msgid ""
+"         There is no indication that the signature belongs to the owner.\n"
 msgstr "         沒有證據指出這個簽章屬於這個持有者.\n"
 
 #: g10/pkclist.c:623
@@ -5919,23 +5585,20 @@ msgid "         The signature is probably a FORGERY.\n"
 msgstr "         這個簽章很有可能是 *偽造的*.\n"
 
 #: g10/pkclist.c:632
-msgid "WARNING: This key is not certified with sufficiently trusted signatures!\n"
+msgid ""
+"WARNING: This key is not certified with sufficiently trusted signatures!\n"
 msgstr "警告: 這把金鑰並非以足夠信任的簽章所認證!\n"
 
 #: g10/pkclist.c:634
 msgid "         It is not certain that the signature belongs to the owner.\n"
 msgstr "         這份簽章並不屬於這個持有者\n"
 
-#: g10/pkclist.c:833
-#: g10/pkclist.c:875
-#: g10/pkclist.c:1087
-#: g10/pkclist.c:1157
+#: g10/pkclist.c:833 g10/pkclist.c:875 g10/pkclist.c:1087 g10/pkclist.c:1157
 #, c-format
 msgid "%s: skipped: %s\n"
 msgstr "%s: 已跳過: %s\n"
 
-#: g10/pkclist.c:845
-#: g10/pkclist.c:1125
+#: g10/pkclist.c:845 g10/pkclist.c:1125
 #, c-format
 msgid "%s: skipped: public key already present\n"
 msgstr "%s: 已跳過: 公鑰已存在\n"
@@ -5960,8 +5623,7 @@ msgstr ""
 msgid "No such user ID.\n"
 msgstr "沒有這個使用者 ID.\n"
 
-#: g10/pkclist.c:980
-#: g10/pkclist.c:1054
+#: g10/pkclist.c:980 g10/pkclist.c:1054
 msgid "skipped: public key already set as default recipient\n"
 msgstr "已跳過: 公鑰已經被設成預設收件者\n"
 
@@ -6001,28 +5663,28 @@ msgstr "警告: 金鑰 %s 沒有 %s 的偏好設定\n"
 msgid "data not saved; use option \"--output\" to save it\n"
 msgstr "資料未被儲存; 請用 \"--output\" 選項來儲存\n"
 
-#: g10/plaintext.c:472
+#: g10/plaintext.c:480
 msgid "Detached signature.\n"
 msgstr "分離的簽章.\n"
 
-#: g10/plaintext.c:479
+#: g10/plaintext.c:487
 msgid "Please enter name of data file: "
 msgstr "請輸入資料檔的名稱: "
 
-#: g10/plaintext.c:511
+#: g10/plaintext.c:519
 msgid "reading stdin ...\n"
 msgstr "正在讀取標準輸入中 ...\n"
 
-#: g10/plaintext.c:549
+#: g10/plaintext.c:557
 msgid "no signed data\n"
 msgstr "沒有被簽署過的資料\n"
 
-#: g10/plaintext.c:565
+#: g10/plaintext.c:573
 #, c-format
 msgid "can't open signed data `%s'\n"
 msgstr "無法開啟被簽署過的資料 `%s'\n"
 
-#: g10/plaintext.c:599
+#: g10/plaintext.c:607
 #, c-format
 msgid "can't open signed data fd=%d: %s\n"
 msgstr "無法開啟被簽署過的資料 fd=%d: %s\n"
@@ -6059,12 +5721,8 @@ msgstr "請注意: 私鑰 %s 在 %s 過期了\n"
 msgid "NOTE: key has been revoked"
 msgstr "請注意: 金鑰已撤銷"
 
-#: g10/revoke.c:102
-#: g10/revoke.c:116
-#: g10/revoke.c:128
-#: g10/revoke.c:174
-#: g10/revoke.c:186
-#: g10/revoke.c:585
+#: g10/revoke.c:102 g10/revoke.c:116 g10/revoke.c:128 g10/revoke.c:174
+#: g10/revoke.c:186 g10/revoke.c:585
 #, c-format
 msgid "build_packet failed: %s\n"
 msgstr "build_packet 失敗: %s\n"
@@ -6086,13 +5744,11 @@ msgstr "(這是把機密的撤銷金鑰)\n"
 msgid "Create a designated revocation certificate for this key? (y/N) "
 msgstr "要為這把金鑰建立一份指定撤銷憑證嗎? (y/N) "
 
-#: g10/revoke.c:327
-#: g10/revoke.c:551
+#: g10/revoke.c:327 g10/revoke.c:551
 msgid "ASCII armored output forced.\n"
 msgstr "已強迫使用 ASCII 封裝過的輸出.\n"
 
-#: g10/revoke.c:342
-#: g10/revoke.c:565
+#: g10/revoke.c:342 g10/revoke.c:565
 #, c-format
 msgid "make_keysig_packet failed: %s\n"
 msgstr "make_keysig_packet 失敗: %s\n"
@@ -6212,8 +5868,7 @@ msgstr "警告: 偵測到金鑰薄弱 - 請再更換一次密語.\n"
 msgid "generating the deprecated 16-bit checksum for secret key protection\n"
 msgstr "正在產生私鑰保護會用到的舊式 16 位元加總檢查\n"
 
-#: g10/seskey.c:61
-#: sm/encrypt.c:119
+#: g10/seskey.c:61 sm/encrypt.c:119
 msgid "weak key created - retrying\n"
 msgstr "建立了弱金鑰 - 重試中\n"
 
@@ -6222,8 +5877,7 @@ msgstr "建立了弱金鑰 - 重試中\n"
 msgid "cannot avoid weak key for symmetric cipher; tried %d times!\n"
 msgstr "無法避免對稱式編密法的弱金鑰; 已經試了 %d 次了!\n"
 
-#: g10/seskey.c:227
-#: sm/certcheck.c:85
+#: g10/seskey.c:227 sm/certcheck.c:85
 msgid "DSA requires the hash length to be a multiple of 8 bits\n"
 msgstr "DSA 需要 8 位元倍數的雜湊長度\n"
 
@@ -6263,12 +5917,14 @@ msgstr "公鑰 %s 比簽章還要新了 %lu 秒\n"
 
 #: g10/sig-check.c:223
 #, c-format
-msgid "key %s was created %lu second in the future (time warp or clock problem)\n"
+msgid ""
+"key %s was created %lu second in the future (time warp or clock problem)\n"
 msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:225
 #, c-format
-msgid "key %s was created %lu seconds in the future (time warp or clock problem)\n"
+msgid ""
+"key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr "金鑰 %s 已經在 %lu 秒後的未來製妥 (可能是因為時光旅行或時鐘的問題)\n"
 
 #: g10/sig-check.c:239
@@ -6303,12 +5959,15 @@ msgstr "警告: 註記 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:115
 #, c-format
-msgid "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告: 原則 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:138
 #, c-format
-msgid "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using unexpanded.\n"
+msgid ""
+"WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
+"unexpanded.\n"
 msgstr "警告: 偏好金鑰伺服器 URL 的 %% 無法擴張 (太大了). 現在使用未擴張的.\n"
 
 #: g10/sign.c:311
@@ -6327,7 +5986,8 @@ msgstr "你在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做分�
 
 #: g10/sign.c:837
 #, c-format
-msgid "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
+msgid ""
+"WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告: 強迫使用 %s (%d) 摘要演算法會違反收件者偏好設定\n"
 
 #: g10/sign.c:964
@@ -6343,8 +6003,7 @@ msgstr "你在 --pgp2 模式下祇能夠使用 PGP 2.x 型態的金鑰來做明�
 msgid "%s encryption will be used\n"
 msgstr "%s 加密將被採用\n"
 
-#: g10/skclist.c:140
-#: g10/skclist.c:217
+#: g10/skclist.c:140 g10/skclist.c:217
 msgid "key is not flagged as insecure - can't use it with the faked RNG!\n"
 msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產生器併用!\n"
 
@@ -6353,9 +6012,7 @@ msgstr "金鑰未被標示為不安全 - 不能夠拿來跟假的隨機數字產
 msgid "skipped \"%s\": duplicated\n"
 msgstr "已跳過 \"%s\": 重複了\n"
 
-#: g10/skclist.c:182
-#: g10/skclist.c:195
-#: g10/skclist.c:207
+#: g10/skclist.c:182 g10/skclist.c:195 g10/skclist.c:207
 #, c-format
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳過 \"%s\": %s\n"
@@ -6368,8 +6025,7 @@ msgstr "已跳過: 私鑰已經存在\n"
 msgid "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "這是由 PGP 產生的 ElGamal 金鑰, 用於簽章並不安全!"
 
-#: g10/tdbdump.c:58
-#: g10/trustdb.c:360
+#: g10/tdbdump.c:58 g10/trustdb.c:360
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任記錄 %lu, 類別 %d: 寫入失敗: %s\n"
@@ -6383,10 +6039,7 @@ msgstr ""
 "# 相對應的信任值清單被建立於 %s\n"
 "# (請用 \"gpg --import-ownertrust\" 來取回它們)\n"
 
-#: g10/tdbdump.c:161
-#: g10/tdbdump.c:169
-#: g10/tdbdump.c:174
-#: g10/tdbdump.c:179
+#: g10/tdbdump.c:161 g10/tdbdump.c:169 g10/tdbdump.c:174 g10/tdbdump.c:179
 #, c-format
 msgid "error in `%s': %s\n"
 msgstr "在 `%s' 中出錯: %s\n"
@@ -6417,20 +6070,17 @@ msgstr "在 `%s' 中尋找信任記錄時出錯: %s\n"
 msgid "read error in `%s': %s\n"
 msgstr "讀取 `%s' 錯誤: %s\n"
 
-#: g10/tdbdump.c:229
-#: g10/trustdb.c:375
+#: g10/tdbdump.c:229 g10/trustdb.c:375
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任資料庫: 同步化失敗: %s\n"
 
-#: g10/tdbio.c:128
-#: g10/tdbio.c:1450
+#: g10/tdbio.c:128 g10/tdbio.c:1450
 #, c-format
 msgid "trustdb rec %lu: lseek failed: %s\n"
 msgstr "信任資料庫記錄 %lu: 本機搜尋失敗: %s\n"
 
-#: g10/tdbio.c:135
-#: g10/tdbio.c:1457
+#: g10/tdbio.c:135 g10/tdbio.c:1457
 #, c-format
 msgid "trustdb rec %lu: write failed (n=%d): %s\n"
 msgstr "信任資料庫記錄 %lu: 寫入失敗 (n=%d): %s\n"
@@ -6449,16 +6099,12 @@ msgstr "無法存取 `%s': %s\n"
 msgid "%s: directory does not exist!\n"
 msgstr "%s: 目錄不存在!\n"
 
-#: g10/tdbio.c:535
-#: g10/tdbio.c:558
-#: g10/tdbio.c:599
-#: sm/keydb.c:221
+#: g10/tdbio.c:535 g10/tdbio.c:558 g10/tdbio.c:599 sm/keydb.c:221
 #, c-format
 msgid "can't create lock for `%s'\n"
 msgstr "無法為 `%s' 建立鎖定\n"
 
-#: g10/tdbio.c:537
-#: g10/tdbio.c:602
+#: g10/tdbio.c:537 g10/tdbio.c:602
 #, c-format
 msgid "can't lock `%s'\n"
 msgstr "無法鎖定 `%s'\n"
@@ -6497,13 +6143,8 @@ msgstr "%s: 建立雜湊表失敗: %s\n"
 msgid "%s: error updating version record: %s\n"
 msgstr "%s: 更新版本記錄時錯誤: %s\n"
 
-#: g10/tdbio.c:678
-#: g10/tdbio.c:698
-#: g10/tdbio.c:714
-#: g10/tdbio.c:728
-#: g10/tdbio.c:758
-#: g10/tdbio.c:1382
-#: g10/tdbio.c:1409
+#: g10/tdbio.c:678 g10/tdbio.c:698 g10/tdbio.c:714 g10/tdbio.c:728
+#: g10/tdbio.c:758 g10/tdbio.c:1382 g10/tdbio.c:1409
 #, c-format
 msgid "%s: error reading version record: %s\n"
 msgstr "%s: 讀取版本記錄時錯誤: %s\n"
@@ -6633,8 +6274,7 @@ msgstr "10 譯者請參見 trustdb.c:uid_trust_string_fixed"
 msgid "[ revoked]"
 msgstr "[ 已撤銷 ]"
 
-#: g10/trustdb.c:524
-#: g10/trustdb.c:529
+#: g10/trustdb.c:524 g10/trustdb.c:529
 msgid "[ expired]"
 msgstr "[ 已過期 ]"
 
@@ -6682,8 +6322,7 @@ msgstr "徹底"
 msgid "no need for a trustdb check\n"
 msgstr "不需要檢查信任資料庫\n"
 
-#: g10/trustdb.c:598
-#: g10/trustdb.c:2483
+#: g10/trustdb.c:598 g10/trustdb.c:2483
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任資料庫檢查將於 %s 進行\n"
@@ -6698,8 +6337,7 @@ msgstr "在 `%s' 信任模型中並不需要檢查信任資料庫\n"
 msgid "no need for a trustdb update with `%s' trust model\n"
 msgstr "在 `%s' 信任模型中並不需要更新信任資料庫\n"
 
-#: g10/trustdb.c:854
-#: g10/trustdb.c:1306
+#: g10/trustdb.c:854 g10/trustdb.c:1306
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "找不到公鑰 %s: %s\n"
@@ -6733,7 +6371,8 @@ msgstr "%d 個勉強信任以及 %d 個完全信任是 %s 信任模型的最小�
 
 #: g10/trustdb.c:2414
 #, c-format
-msgid "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
+msgid ""
+"depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度: %d  有效: %3d  已簽署: %3d  信任: %d-, %dq, %dn, %dm, %df, %du\n"
 
 #: g10/trustdb.c:2489
@@ -6847,8 +6486,7 @@ msgstr "沒有從 `%s' 到 `%s' 之間的轉換可用\n"
 msgid "iconv_open failed: %s\n"
 msgstr "iconv_open 失敗: %s\n"
 
-#: jnlib/utf8conv.c:388
-#: jnlib/utf8conv.c:654
+#: jnlib/utf8conv.c:388 jnlib/utf8conv.c:654
 #, c-format
 msgid "conversion from `%s' to `%s' failed: %s\n"
 msgstr "從 `%s' 轉換成 `%s' 失敗: %s\n"
@@ -6911,26 +6549,19 @@ msgstr ""
 "語法: kbxutil [選項] [檔案]\n"
 "列出, 匯出, 匯入金鑰鑰匙盒資料\n"
 
-#: scd/app-nks.c:713
-#: scd/app-openpgp.c:2638
+#: scd/app-nks.c:713 scd/app-openpgp.c:2638
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 模組缺漏或者並非 %d 位元大\n"
 
-#: scd/app-nks.c:721
-#: scd/app-openpgp.c:2650
+#: scd/app-nks.c:721 scd/app-openpgp.c:2650
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公用指數缺漏或者大於 %d 位元\n"
 
-#: scd/app-nks.c:801
-#: scd/app-openpgp.c:1540
-#: scd/app-openpgp.c:1559
-#: scd/app-openpgp.c:1720
-#: scd/app-openpgp.c:1737
-#: scd/app-openpgp.c:1985
-#: scd/app-openpgp.c:2030
-#: scd/app-dinsig.c:303
+#: scd/app-nks.c:801 scd/app-openpgp.c:1540 scd/app-openpgp.c:1559
+#: scd/app-openpgp.c:1720 scd/app-openpgp.c:1737 scd/app-openpgp.c:1985
+#: scd/app-openpgp.c:2030 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "收回個人識別碼 (PIN) 時傳回錯誤: %s\n"
@@ -6964,16 +6595,18 @@ msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||請輸入金鑰的個人識別碼 (PIN) 以建立完善的簽章."
 
 #: scd/app-nks.c:1119
-msgid "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create qualified signatures."
+msgid ""
+"|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
 msgstr "|NP|請輸入金鑰的新 PIN 重設碼 (PUK) 以建立完善的簽章."
 
 #: scd/app-nks.c:1121
-msgid "|P|Please enter the PIN Unblocking Code (PUK) for the key to create qualified signatures."
+msgid ""
+"|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
+"qualified signatures."
 msgstr "|P|請輸入金鑰的 PIN 重設碼 (PUK) 以建立完善的簽章."
 
-#: scd/app-nks.c:1222
-#: scd/app-openpgp.c:2063
-#: scd/app-dinsig.c:532
+#: scd/app-nks.c:1222 scd/app-openpgp.c:2063 scd/app-dinsig.c:532
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "取得新的個人識別碼 (PIN) 時出錯: %s\n"
@@ -6993,18 +6626,15 @@ msgstr "存放創生日期失敗: %s\n"
 msgid "reading public key failed: %s\n"
 msgstr "讀取公鑰時失敗: %s\n"
 
-#: scd/app-openpgp.c:1155
-#: scd/app-openpgp.c:2873
+#: scd/app-openpgp.c:1155 scd/app-openpgp.c:2873
 msgid "response does not contain the public key data\n"
 msgstr "回應中未包含公鑰資料\n"
 
-#: scd/app-openpgp.c:1163
-#: scd/app-openpgp.c:2881
+#: scd/app-openpgp.c:1163 scd/app-openpgp.c:2881
 msgid "response does not contain the RSA modulus\n"
 msgstr "回應中未包含 RSA 系數\n"
 
-#: scd/app-openpgp.c:1172
-#: scd/app-openpgp.c:2891
+#: scd/app-openpgp.c:1172 scd/app-openpgp.c:2891
 msgid "response does not contain the RSA public exponent\n"
 msgstr "回應中未包含 RSA 公用指數\n"
 
@@ -7023,34 +6653,26 @@ msgstr "使用 %s 做為預設個人識別碼 (PIN) 失敗: %s - 正在停用之
 msgid "||Please enter the PIN%%0A[sigs done: %lu]"
 msgstr "||請輸入 PIN%%0A[簽署完成: %lu]"
 
-#: scd/app-openpgp.c:1525
-#: scd/app-openpgp.c:1979
+#: scd/app-openpgp.c:1525 scd/app-openpgp.c:1979
 msgid "||Please enter the PIN"
 msgstr "||請輸入個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:1566
-#: scd/app-openpgp.c:1744
-#: scd/app-openpgp.c:1992
+#: scd/app-openpgp.c:1566 scd/app-openpgp.c:1744 scd/app-openpgp.c:1992
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "用於 CHV%d 的個人識別碼 (PIN) 太短; 長度最少要有 %d\n"
 
-#: scd/app-openpgp.c:1579
-#: scd/app-openpgp.c:1618
-#: scd/app-openpgp.c:1756
+#: scd/app-openpgp.c:1579 scd/app-openpgp.c:1618 scd/app-openpgp.c:1756
 #: scd/app-openpgp.c:3191
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "驗證 CHV%d 失敗: %s\n"
 
-#: scd/app-openpgp.c:1647
-#: scd/app-openpgp.c:2011
-#: scd/app-openpgp.c:3487
+#: scd/app-openpgp.c:1647 scd/app-openpgp.c:2011 scd/app-openpgp.c:3487
 msgid "error retrieving CHV status from card\n"
 msgstr "從卡片取回 CHV 狀態時出錯\n"
 
-#: scd/app-openpgp.c:1653
-#: scd/app-openpgp.c:3496
+#: scd/app-openpgp.c:1653 scd/app-openpgp.c:3496
 msgid "card is permanently locked!\n"
 msgstr "卡片永久鎖定了!!\n"
 
@@ -7078,8 +6700,7 @@ msgstr "管理者指令存取權限尚未組態\n"
 msgid "||Please enter the Reset Code for the card"
 msgstr "||請輸入卡片的重設碼"
 
-#: scd/app-openpgp.c:2036
-#: scd/app-openpgp.c:2088
+#: scd/app-openpgp.c:2036 scd/app-openpgp.c:2088
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重設碼太短; 長度最少要有 %d\n"
@@ -7096,13 +6717,11 @@ msgstr "|AN|新增管理者個人識別碼 (PIN)"
 msgid "|N|New PIN"
 msgstr "|N|新增個人識別碼 (PIN)"
 
-#: scd/app-openpgp.c:2169
-#: scd/app-openpgp.c:2959
+#: scd/app-openpgp.c:2169 scd/app-openpgp.c:2959
 msgid "error reading application data\n"
 msgstr "讀取應用程式資料時出錯\n"
 
-#: scd/app-openpgp.c:2175
-#: scd/app-openpgp.c:2966
+#: scd/app-openpgp.c:2175 scd/app-openpgp.c:2966
 msgid "error reading fingerprint DO\n"
 msgstr "讀取指紋 DO 時出錯\n"
 
@@ -7126,8 +6745,7 @@ msgstr "正在寫入新的金鑰\n"
 msgid "creation timestamp missing\n"
 msgstr "缺漏創生時間戳印\n"
 
-#: scd/app-openpgp.c:2660
-#: scd/app-openpgp.c:2668
+#: scd/app-openpgp.c:2660 scd/app-openpgp.c:2668
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 質數 %s 缺漏或者並非 %d 位元大\n"
@@ -7169,11 +6787,11 @@ msgid "signatures created so far: %lu\n"
 msgstr "目前建立的簽章: %lu\n"
 
 #: scd/app-openpgp.c:3501
-msgid "verification of Admin PIN is currently prohibited through this command\n"
+msgid ""
+"verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前在此指令中的管理者 PIN 驗證被禁止了\n"
 
-#: scd/app-openpgp.c:3726
-#: scd/app-openpgp.c:3737
+#: scd/app-openpgp.c:3726 scd/app-openpgp.c:3737
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "無法存取 %s - 無效的 OpenPGP 卡片?\n"
@@ -7193,13 +6811,11 @@ msgstr "|N|開始新增個人識別碼 (PIN)"
 msgid "run in multi server mode (foreground)"
 msgstr "以多重伺服器模式執行 (前景)"
 
-#: scd/scdaemon.c:117
-#: sm/gpgsm.c:316
+#: scd/scdaemon.c:117 sm/gpgsm.c:316
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|等級|設定除錯等級為「等級」"
 
-#: scd/scdaemon.c:124
-#: tools/gpgconf-comp.c:620
+#: scd/scdaemon.c:124 tools/gpgconf-comp.c:620
 msgid "|FILE|write a log to FILE"
 msgstr "|檔案|將日誌寫入至「檔案」"
 
@@ -7290,13 +6906,11 @@ msgstr "無法連線至 dirmngr - 正試著退回\n"
 msgid "validation model requested by certificate: %s"
 msgstr "憑證所要求的驗證模型: %s"
 
-#: sm/certchain.c:197
-#: sm/certchain.c:1828
+#: sm/certchain.c:197 sm/certchain.c:1828
 msgid "chain"
 msgstr "chain"
 
-#: sm/certchain.c:198
-#: sm/certchain.c:1828
+#: sm/certchain.c:198 sm/certchain.c:1828
 msgid "shell"
 msgstr "shell"
 
@@ -7318,13 +6932,11 @@ msgstr "關鍵已標記原則沒有已組態的原則"
 msgid "failed to open `%s': %s\n"
 msgstr "開啟 `%s' 失敗: %s\n"
 
-#: sm/certchain.c:353
-#: sm/certchain.c:382
+#: sm/certchain.c:353 sm/certchain.c:382
 msgid "note: non-critical certificate policy not allowed"
 msgstr "請注意: 不允許非關鍵的憑證原則"
 
-#: sm/certchain.c:357
-#: sm/certchain.c:386
+#: sm/certchain.c:357 sm/certchain.c:386
 msgid "certificate policy not allowed"
 msgstr "未允許憑證原則"
 
@@ -7351,13 +6963,8 @@ msgstr "吻合的憑證數量: %d\n"
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "尋找限於 dirmngr 快取的金鑰時失敗: %s\n"
 
-#: sm/certchain.c:759
-#: sm/certchain.c:1252
-#: sm/certchain.c:1856
-#: sm/decrypt.c:261
-#: sm/encrypt.c:335
-#: sm/sign.c:335
-#: sm/verify.c:113
+#: sm/certchain.c:759 sm/certchain.c:1252 sm/certchain.c:1856 sm/decrypt.c:261
+#: sm/encrypt.c:335 sm/sign.c:335 sm/verify.c:113
 msgid "failed to allocated keyDB handle\n"
 msgstr "配置 keyDB handle 失敗\n"
 
@@ -7378,24 +6985,20 @@ msgstr "請確認 \"dirmngr\" 已安裝妥善\n"
 msgid "checking the CRL failed: %s"
 msgstr "檢查 CRL 時失敗: %s"
 
-#: sm/certchain.c:982
-#: sm/certchain.c:1050
+#: sm/certchain.c:982 sm/certchain.c:1050
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "有效性無效的憑證: %s"
 
-#: sm/certchain.c:997
-#: sm/certchain.c:1082
+#: sm/certchain.c:997 sm/certchain.c:1082
 msgid "certificate not yet valid"
 msgstr "憑證尚未生效"
 
-#: sm/certchain.c:998
-#: sm/certchain.c:1083
+#: sm/certchain.c:998 sm/certchain.c:1083
 msgid "root certificate not yet valid"
 msgstr "根憑證尚未生效"
 
-#: sm/certchain.c:999
-#: sm/certchain.c:1084
+#: sm/certchain.c:999 sm/certchain.c:1084
 msgid "intermediate certificate not yet valid"
 msgstr "媒介憑證尚未生效"
 
@@ -7486,8 +7089,7 @@ msgstr "根憑證未標記為已信任"
 msgid "checking the trust list failed: %s\n"
 msgstr "檢查信任清單時失敗: %s\n"
 
-#: sm/certchain.c:1477
-#: sm/import.c:160
+#: sm/certchain.c:1477 sm/import.c:160
 msgid "certificate chain too long\n"
 msgstr "憑證鏈太長\n"
 
@@ -7508,8 +7110,7 @@ msgstr "找到了另一個可能吻合的 CA 憑證 - 正再試一次"
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "憑證鏈比 CA 所允許的 (%d) 還長"
 
-#: sm/certchain.c:1644
-#: sm/certchain.c:1927
+#: sm/certchain.c:1644 sm/certchain.c:1927
 msgid "certificate is good\n"
 msgstr "憑證完好\n"
 
@@ -7540,42 +7141,35 @@ msgstr "金鑰 %s 使用不安全 (%u 位元) 的雜湊\n"
 msgid "a %u bit hash is not valid for a %u bit %s key\n"
 msgstr "%u 位元的雜湊對 %u 位元的 %s 金鑰來說是無效的\n"
 
-#: sm/certcheck.c:244
-#: sm/verify.c:201
+#: sm/certcheck.c:244 sm/verify.c:201
 msgid "(this is the MD2 algorithm)\n"
 msgstr "(這是 MD2 演算法)\n"
 
-#: sm/certdump.c:60
-#: sm/certdump.c:143
+#: sm/certdump.c:60 sm/certdump.c:143
 msgid "none"
 msgstr "無"
 
-#: sm/certdump.c:564
-#: sm/certdump.c:609
-#: sm/certdump.c:674
-#: sm/certdump.c:732
+#: sm/certdump.c:564 sm/certdump.c:609 sm/certdump.c:674 sm/certdump.c:732
 msgid "[Error - invalid encoding]"
 msgstr "[錯誤 - 無效的編碼]"
 
-#: sm/certdump.c:572
-#: sm/certdump.c:617
+#: sm/certdump.c:572 sm/certdump.c:617
 msgid "[Error - out of core]"
 msgstr "[錯誤 - 超出核心]"
 
-#: sm/certdump.c:654
-#: sm/certdump.c:710
+#: sm/certdump.c:654 sm/certdump.c:710
 msgid "[Error - No name]"
 msgstr "[錯誤 - 沒有名稱]"
 
-#: sm/certdump.c:679
-#: sm/certdump.c:738
+#: sm/certdump.c:679 sm/certdump.c:738
 msgid "[Error - invalid DN]"
 msgstr "[錯誤 - 無效的 DN]"
 
 #: sm/certdump.c:948
 #, c-format
 msgid ""
-"Please enter the passphrase to unlock the secret key for the X.509 certificate:\n"
+"Please enter the passphrase to unlock the secret key for the X.509 "
+"certificate:\n"
 "\"%s\"\n"
 "S/N %s, ID 0x%08lX,\n"
 "created %s, expires %s.\n"
@@ -7589,8 +7183,7 @@ msgstr ""
 msgid "no key usage specified - assuming all usages\n"
 msgstr "沒有指定的金鑰用途 - 假設為所有的用途\n"
 
-#: sm/certlist.c:132
-#: sm/keylist.c:272
+#: sm/certlist.c:132 sm/keylist.c:272
 #, c-format
 msgid "error getting key usage information: %s\n"
 msgstr "取得金鑰用途資訊時出錯: %s\n"
@@ -7665,7 +7258,9 @@ msgid "line %d: key generation failed: %s <%s>\n"
 msgstr "第 %d 列: 金鑰產生失敗: %s <%s>\n"
 
 #: sm/certreqgen.c:806
-msgid "To complete this certificate request please enter the passphrase for the key you just created once more.\n"
+msgid ""
+"To complete this certificate request please enter the passphrase for the key "
+"you just created once more.\n"
 msgstr "如欲完成此憑證請求, 請再輸入一次你剛才建立的金鑰密語.\n"
 
 #: sm/certreqgen-ui.c:158
@@ -7695,8 +7290,7 @@ msgstr "不是有效的金鑰鑰柄 (應該要是 40 位十六進制數值)\n"
 msgid "No key with this keygrip\n"
 msgstr "沒有金鑰有此金鑰鑰柄\n"
 
-#: sm/certreqgen-ui.c:230
-#: sm/certreqgen-ui.c:239
+#: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "讀取卡片時出錯: %s\n"
@@ -7769,8 +7363,7 @@ msgstr " (以空白列結束):\n"
 msgid "Enter DNS names"
 msgstr "請輸入 DNS 名稱"
 
-#: sm/certreqgen-ui.c:340
-#: sm/certreqgen-ui.c:345
+#: sm/certreqgen-ui.c:340 sm/certreqgen-ui.c:345
 msgid " (optional; end with an empty line):\n"
 msgstr " (非必要; 以空白列結束):\n"
 
@@ -7802,15 +7395,12 @@ msgstr "(這是 RC2 演算法)\n"
 msgid "(this does not seem to be an encrypted message)\n"
 msgstr "(這看起來不像是個加密過的訊息)\n"
 
-#: sm/delete.c:51
-#: sm/delete.c:112
+#: sm/delete.c:51 sm/delete.c:112
 #, c-format
 msgid "certificate `%s' not found: %s\n"
 msgstr "找不到憑證 `%s': %s\n"
 
-#: sm/delete.c:122
-#: sm/keydb.c:1399
-#: sm/keydb.c:1501
+#: sm/delete.c:122 sm/keydb.c:1399 sm/keydb.c:1501
 #, c-format
 msgid "error locking keybox: %s\n"
 msgstr "鎖住金鑰鑰匙盒時出錯: %s\n"
@@ -7938,8 +7528,7 @@ msgstr "|檔案|將此金鑰鑰匙圈加到金鑰鑰匙圈清單「檔案」中"
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|使用者-ID|使用「使用者-ID」做為預設私鑰"
 
-#: sm/gpgsm.c:311
-#: tools/gpgconf-comp.c:745
+#: sm/gpgsm.c:311 tools/gpgconf-comp.c:745
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此金鑰伺服器來查找金鑰"
 
@@ -8029,27 +7618,21 @@ msgstr "存放憑證時出錯\n"
 msgid "basic certificate checks failed - not imported\n"
 msgstr "基本的憑證檢查失敗了 - 未匯入\n"
 
-#: sm/import.c:429
-#: sm/keydb.c:1321
-#: sm/keydb.c:1389
+#: sm/import.c:429 sm/keydb.c:1321 sm/keydb.c:1389
 msgid "failed to allocate keyDB handle\n"
 msgstr "配置 keyDB handle 失敗\n"
 
-#: sm/import.c:486
-#: sm/keydb.c:1419
-#: sm/keydb.c:1513
+#: sm/import.c:486 sm/keydb.c:1419 sm/keydb.c:1513
 #, c-format
 msgid "error getting stored flags: %s\n"
 msgstr "取得已存放的旗標時出錯: %s\n"
 
-#: sm/import.c:545
-#: sm/import.c:577
+#: sm/import.c:545 sm/import.c:577
 #, c-format
 msgid "error importing certificate: %s\n"
 msgstr "匯入憑證時出錯: %s\n"
 
-#: sm/import.c:678
-#: tools/gpg-connect-agent.c:1346
+#: sm/import.c:678 tools/gpg-connect-agent.c:1346
 #, c-format
 msgid "error reading input: %s\n"
 msgstr "讀取輸入時出錯: %s\n"
@@ -8068,8 +7651,7 @@ msgstr "你可能會先想啟動 gpg-agent\n"
 msgid "keybox `%s' created\n"
 msgstr "`%s' 鑰匙盒已建立\n"
 
-#: sm/keydb.c:1314
-#: sm/keydb.c:1382
+#: sm/keydb.c:1314 sm/keydb.c:1382
 msgid "failed to get the fingerprint\n"
 msgstr "取得指紋失敗\n"
 
@@ -8093,8 +7675,7 @@ msgstr "存放憑證時出錯: %s\n"
 msgid "problem re-searching certificate: %s\n"
 msgstr "重新搜尋憑證的問題: %s\n"
 
-#: sm/keydb.c:1431
-#: sm/keydb.c:1524
+#: sm/keydb.c:1431 sm/keydb.c:1524
 #, c-format
 msgid "error storing flags: %s\n"
 msgstr "存放旗標時出錯: %s\n"
@@ -8122,7 +7703,8 @@ msgstr "無效的國家代碼於 `%s', 第 %d 列\n"
 msgid ""
 "You are about to create a signature using your certificate:\n"
 "\"%s\"\n"
-"This will create a qualified signature by law equated to a handwritten signature.\n"
+"This will create a qualified signature by law equated to a handwritten "
+"signature.\n"
 "\n"
 "%s%sAre you really sure that you want to do this?"
 msgstr ""
@@ -8132,9 +7714,10 @@ msgstr ""
 "\n"
 "%s%s請問你是否真的確定要這樣做了?"
 
-#: sm/qualified.c:211
-#: sm/verify.c:616
-msgid "Note, that this software is not officially approved to create or verify such signatures.\n"
+#: sm/qualified.c:211 sm/verify.c:616
+msgid ""
+"Note, that this software is not officially approved to create or verify such "
+"signatures.\n"
 msgstr "請注意, 本軟體並未正式被認可來建立或驗證這樣的簽章.\n"
 
 #: sm/qualified.c:278
@@ -8177,7 +7760,8 @@ msgid " using certificate ID 0x%08lX\n"
 msgstr " 以憑證 ID 0x%08lX\n"
 
 #: sm/verify.c:473
-msgid "invalid signature: message digest attribute does not match computed one\n"
+msgid ""
+"invalid signature: message digest attribute does not match computed one\n"
 msgstr "無效的簽章: 訊息摘要屬性與計算而得的不吻合\n"
 
 #: sm/verify.c:594
@@ -8192,9 +7776,7 @@ msgstr "                亦即"
 msgid "This is a qualified signature\n"
 msgstr "這是一份合格簽章\n"
 
-#: tools/gpg-connect-agent.c:70
-#: tools/gpgconf.c:81
-#: tools/symcryptrun.c:164
+#: tools/gpg-connect-agent.c:70 tools/gpgconf.c:81 tools/symcryptrun.c:164
 msgid "quiet"
 msgstr "安靜模式"
 
@@ -8248,8 +7830,7 @@ msgstr "\"%s\" 選項需要有程式及選用的引數\n"
 msgid "option \"%s\" ignored due to \"%s\"\n"
 msgstr "\"%s\" 選項因為 \"%s\" 而被忽略了\n"
 
-#: tools/gpg-connect-agent.c:1281
-#: tools/gpg-connect-agent.c:1771
+#: tools/gpg-connect-agent.c:1281 tools/gpg-connect-agent.c:1771
 #, c-format
 msgid "receiving line failed: %s\n"
 msgstr "接收列時失敗: %s\n"
@@ -8282,40 +7863,27 @@ msgstr "送出 `%s' 指令時出錯: %s\n"
 msgid "error sending standard options: %s\n"
 msgstr "送出標準選項時出錯: %s\n"
 
-#: tools/gpgconf-comp.c:473
-#: tools/gpgconf-comp.c:577
-#: tools/gpgconf-comp.c:644
-#: tools/gpgconf-comp.c:712
-#: tools/gpgconf-comp.c:799
+#: tools/gpgconf-comp.c:473 tools/gpgconf-comp.c:577 tools/gpgconf-comp.c:644
+#: tools/gpgconf-comp.c:712 tools/gpgconf-comp.c:799
 msgid "Options controlling the diagnostic output"
 msgstr "控制著診斷性輸出的選項"
 
-#: tools/gpgconf-comp.c:486
-#: tools/gpgconf-comp.c:590
-#: tools/gpgconf-comp.c:657
-#: tools/gpgconf-comp.c:725
-#: tools/gpgconf-comp.c:822
+#: tools/gpgconf-comp.c:486 tools/gpgconf-comp.c:590 tools/gpgconf-comp.c:657
+#: tools/gpgconf-comp.c:725 tools/gpgconf-comp.c:822
 msgid "Options controlling the configuration"
 msgstr "控制著組態的選項"
 
-#: tools/gpgconf-comp.c:496
-#: tools/gpgconf-comp.c:615
-#: tools/gpgconf-comp.c:673
-#: tools/gpgconf-comp.c:750
-#: tools/gpgconf-comp.c:829
+#: tools/gpgconf-comp.c:496 tools/gpgconf-comp.c:615 tools/gpgconf-comp.c:673
+#: tools/gpgconf-comp.c:750 tools/gpgconf-comp.c:829
 msgid "Options useful for debugging"
 msgstr "對除錯有幫助的選項"
 
-#: tools/gpgconf-comp.c:501
-#: tools/gpgconf-comp.c:678
-#: tools/gpgconf-comp.c:755
+#: tools/gpgconf-comp.c:501 tools/gpgconf-comp.c:678 tools/gpgconf-comp.c:755
 #: tools/gpgconf-comp.c:837
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|檔案|將伺服器模式日誌寫入至「檔案」"
 
-#: tools/gpgconf-comp.c:509
-#: tools/gpgconf-comp.c:625
-#: tools/gpgconf-comp.c:763
+#: tools/gpgconf-comp.c:509 tools/gpgconf-comp.c:625 tools/gpgconf-comp.c:763
 msgid "Options controlling the security"
 msgstr "控制著安全性的選項"
 
@@ -8359,13 +7927,11 @@ msgstr "|N|在 N 天之後讓密語過期"
 msgid "do not allow the reuse of old passphrases"
 msgstr "不允許重複使用舊密語"
 
-#: tools/gpgconf-comp.c:659
-#: tools/gpgconf-comp.c:727
+#: tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:727
 msgid "|NAME|use NAME as default secret key"
 msgstr "|名字|使用「名字」做為預設私鑰"
 
-#: tools/gpgconf-comp.c:662
-#: tools/gpgconf-comp.c:730
+#: tools/gpgconf-comp.c:662 tools/gpgconf-comp.c:730
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|名字|也加密給使用者 ID「名字」"
 
@@ -8494,8 +8060,7 @@ msgstr ""
 "語法: gpgconf [選項]\n"
 "管理 GnuPG 系統工具的組態選項\n"
 
-#: tools/gpgconf.c:214
-#: tools/gpgconf.c:279
+#: tools/gpgconf.c:214 tools/gpgconf.c:279
 msgid "usage: gpgconf [options] "
 msgstr "用法: gpgconf [選項] "
 
@@ -8503,8 +8068,7 @@ msgstr "用法: gpgconf [選項] "
 msgid "Need one component argument"
 msgstr "需要一個元件引數"
 
-#: tools/gpgconf.c:225
-#: tools/gpgconf.c:255
+#: tools/gpgconf.c:225 tools/gpgconf.c:255
 msgid "Component not found"
 msgstr "找不到元件"
 
@@ -8552,10 +8116,12 @@ msgstr "用法: symcryptrun [選項] (或用 -h 求助)"
 
 #: tools/symcryptrun.c:209
 msgid ""
-"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE [options...] COMMAND [inputfile]\n"
+"Syntax: symcryptrun --class CLASS --program PROGRAM --keyfile KEYFILE "
+"[options...] COMMAND [inputfile]\n"
 "Call a simple symmetric encryption tool\n"
 msgstr ""
-"語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選項...] 指令 [輸入檔案]\n"
+"語法: symcryptrun --class 型別 --program 程式 --keyfile 金鑰檔案 [選項...] 指"
+"令 [輸入檔案]\n"
 "叫用單純對稱式加密工具\n"
 
 #: tools/symcryptrun.c:278
@@ -8573,8 +8139,7 @@ msgstr "%s 於 %s 以 %i 狀態失敗了\n"
 msgid "can't create temporary directory `%s': %s\n"
 msgstr "無法建立暫存目錄 `%s': %s\n"
 
-#: tools/symcryptrun.c:351
-#: tools/symcryptrun.c:368
+#: tools/symcryptrun.c:351 tools/symcryptrun.c:368
 #, c-format
 msgid "could not open %s for writing: %s\n"
 msgstr "無法開啟 %s 來寫入: %s\n"
@@ -8589,8 +8154,7 @@ msgstr "寫入 %s 時出錯: %s\n"
 msgid "error reading from %s: %s\n"
 msgstr "讀取 %s 時出錯: %s\n"
 
-#: tools/symcryptrun.c:393
-#: tools/symcryptrun.c:400
+#: tools/symcryptrun.c:393 tools/symcryptrun.c:400
 #, c-format
 msgid "error closing %s: %s\n"
 msgstr "關閉 %s 時出錯: %s\n"
@@ -8694,77 +8258,113 @@ msgstr ""
 
 #~ msgid "Command> "
 #~ msgstr "指令> "
+
 #~ msgid "Please report bugs to <[email protected]>.\n"
 #~ msgstr ""
 #~ "請向 <[email protected]> 回報程式瑕疵, 向 <[email protected]> 回報翻譯瑕疵.\n"
+
 #~ msgid "the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n"
 #~ msgstr "信任資料庫已損毀; 請執行 \"gpg --fix-trustdb\".\n"
+
 #~ msgid "Please report bugs to "
 #~ msgstr "翻譯瑕疵請回報給 [email protected] ; 程式瑕疵則請回報給"
+
 #~ msgid "DSA keypair will have %u bits.\n"
 #~ msgstr "DSA 金鑰對會有 %u 位元長.\n"
+
 #~ msgid "this command has not yet been implemented\n"
 #~ msgstr "這個指令尚未實做完成\n"
+
 #~ msgid "Repeat passphrase\n"
 #~ msgstr "請再輸入一次密語\n"
+
 #~ msgid "||Please enter your PIN at the reader's keypad%%0A[sigs done: %lu]"
 #~ msgstr "||請在讀卡機鍵盤上輸入你的 PIN%%0A[簽署完成: %lu]"
+
 #~ msgid "|A|Admin PIN"
 #~ msgstr "|A|管理者 PIN"
+
 #~ msgid "read options from file"
 #~ msgstr "從檔案中讀取選項"
+
 #~ msgid "Used libraries:"
 #~ msgstr "已使用的函示庫:"
+
 #~ msgid "generate PGP 2.x compatible messages"
 #~ msgstr "產生 PGP 2.x 相容性訊息"
+
 #~ msgid "|[FILE]|make a signature"
 #~ msgstr "|[檔案]|做出簽章"
+
 #~ msgid "|[FILE]|make a clear text signature"
 #~ msgstr "|[檔案]|做出明文簽章"
+
 #~ msgid "|NAME|use NAME as default recipient"
 #~ msgstr "|名字|使用「名字」做為預設收件者"
+
 #~ msgid "use the default key as default recipient"
 #~ msgstr "使用預設的金鑰做為預設的收件者"
+
 #~ msgid "force v3 signatures"
 #~ msgstr "強迫使用第三版簽章"
+
 #~ msgid "always use a MDC for encryption"
 #~ msgstr "總是使用 MDC 來加密"
+
 #~ msgid "add this secret keyring to the list"
 #~ msgstr "將此私鑰鑰匙圈加到清單中"
+
 #~ msgid "|NAME|set terminal charset to NAME"
 #~ msgstr "|名稱|將終端機字元集設為「名稱」"
+
 #~ msgid "|FILE|load extension module FILE"
 #~ msgstr "|檔案|載入延伸模組「檔案」"
+
 #~ msgid "|N|use compress algorithm N"
 #~ msgstr "|N|使用壓縮演算法 N"
+
 #~ msgid "remove key from the public keyring"
 #~ msgstr "從公鑰鑰匙圈裡移除金鑰"
+
 #~ msgid "can't gen prime with pbits=%u qbits=%u\n"
 #~ msgstr "無法以 %u 位元長的 p 及 %u 位元長的 q 產生質數\n"
+
 #~ msgid "can't generate a prime with less than %d bits\n"
 #~ msgstr "無法產生少於 %d 位元的質數\n"
+
 #~ msgid "no entropy gathering module detected\n"
 #~ msgstr "偵測不到亂數蒐集模組\n"
+
 #~ msgid "can't lock `%s': %s\n"
 #~ msgstr "無法鎖定 `%s': %s\n"
+
 #~ msgid "can't stat `%s': %s\n"
 #~ msgstr "無法取得檔案 `%s' 的資訊: %s\n"
+
 #~ msgid "`%s' is not a regular file - ignored\n"
 #~ msgstr "`%s' 不是一個標準的檔案 - 已略過\n"
+
 #~ msgid "note: random_seed file is empty\n"
 #~ msgstr "請注意: random_seed 檔案是空的\n"
+
 #~ msgid "WARNING: invalid size of random_seed file - not used\n"
 #~ msgstr "警告: random_seed 檔案大小無效 - 不予採用\n"
+
 #~ msgid "can't read `%s': %s\n"
 #~ msgstr "無法讀取 `%s': %s\n"
+
 #~ msgid "note: random_seed file not updated\n"
 #~ msgstr "請注意: random_seed 檔案未更新\n"
+
 #~ msgid "can't write `%s': %s\n"
 #~ msgstr "無法寫入 `%s': %s\n"
+
 #~ msgid "can't close `%s': %s\n"
 #~ msgstr "無法關閉 `%s': %s\n"
+
 #~ msgid "WARNING: using insecure random number generator!!\n"
 #~ msgstr "警告: 正在使用不安全的隨機數字產生器!!\n"
+
 #~ msgid ""
 #~ "The random number generator is only a kludge to let\n"
 #~ "it run - it is in no way a strong RNG!\n"
@@ -8777,6 +8377,7 @@ msgstr ""
 #~ "\n"
 #~ "*** 絕對不要把這個程式產生的任何資料拿來用!! ***\n"
 #~ "\n"
+
 #~ msgid ""
 #~ "Please wait, entropy is being gathered. Do some work if it would\n"
 #~ "keep you from getting bored, because it will improve the quality\n"
@@ -8784,6 +8385,7 @@ msgstr ""
 #~ msgstr ""
 #~ "請稍待片刻, 系統此時正在蒐集亂數. 如果你會覺得無聊的話,\n"
 #~ "不妨做些別的事, 這樣子甚至能夠讓亂數的品質更好.\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Not enough random bytes available.  Please do some other work to give\n"
@@ -8792,24 +8394,34 @@ msgstr ""
 #~ "\n"
 #~ "隨機位元組不夠多. 請多做一些有的沒的事情, \n"
 #~ "這樣作業系統纔能蒐集到更多的亂數! (還需要 %d 位元組)\n"
+
 #~ msgid "card reader not available\n"
 #~ msgstr "沒有讀卡機可用\n"
+
 #~ msgid "Please insert the card and hit return or enter 'c' to cancel: "
 #~ msgstr "請插入卡片並按下 [Enter], 或者輸入 'c' 取消: "
+
 #~ msgid "Hit return when ready or enter 'c' to cancel: "
 #~ msgstr "準備好時請按下 [Enter], 或者輸入 'c' 取消: "
+
 #~ msgid "Enter New Admin PIN: "
 #~ msgstr "請輸入新的管理者 PIN: "
+
 #~ msgid "Enter New PIN: "
 #~ msgstr "請輸入新的 PIN: "
+
 #~ msgid "Enter Admin PIN: "
 #~ msgstr "請輸入管理者 PIN: "
+
 #~ msgid "cipher extension `%s' not loaded due to unsafe permissions\n"
 #~ msgstr "編密法延伸模組 `%s' 因為權限不安全而未載入\n"
+
 #~ msgid "NOTE: %s is not available in this version\n"
 #~ msgstr "請注意: %s 在本版中無法使用\n"
+
 #~ msgid "-k[v][v][v][c] [user-id] [keyring]"
 #~ msgstr "-k[v][v][v][c] [使用者ID] [鑰匙圈]"
+
 #~ msgid ""
 #~ "It's up to you to assign a value here; this value will never be exported\n"
 #~ "to any 3rd party.  We need it to implement the web-of-trust; it has "
@@ -8818,6 +8430,7 @@ msgstr ""
 #~ msgstr ""
 #~ "在這裡指派的數值完全是看你自己決定; 這些數值永遠不會匯出給其他人.\n"
 #~ "我們需要它來實施信任網絡; 這跟 (自動建立起的) 憑證網絡一點關係也沒有."
+
 #~ msgid ""
 #~ "To build the Web-of-Trust, GnuPG needs to know which keys are\n"
 #~ "ultimately trusted - those are usually the keys for which you have\n"
@@ -8827,11 +8440,14 @@ msgstr ""
 #~ "要建立起信任網絡, GnuPG 需要知道哪些金鑰是被徹底信任的 -\n"
 #~ "那些金鑰通常就是你有辦法存取到私鑰的. 回答 \"yes\" 來將這些\n"
 #~ "金鑰設成徹底信任\n"
+
 #~ msgid "If you want to use this untrusted key anyway, answer \"yes\"."
 #~ msgstr "如果你無論如何都想要用這把未被信任的金鑰, 請回答 \"yes\"."
+
 #~ msgid ""
 #~ "Enter the user ID of the addressee to whom you want to send the message."
 #~ msgstr "輸入你要遞送的訊息接收者的使用者 ID."
+
 #~ msgid ""
 #~ "Select the algorithm to use.\n"
 #~ "\n"
@@ -8854,6 +8470,7 @@ msgstr ""
 #~ "RSA 可以被用來簽署及加密.\n"
 #~ "\n"
 #~ "第一把 (主要的) 金鑰一定要含有能用於簽署的金鑰."
+
 #~ msgid ""
 #~ "In general it is not a good idea to use the same key for signing and\n"
 #~ "encryption.  This algorithm should only be used in certain domains.\n"
@@ -8862,10 +8479,13 @@ msgstr ""
 #~ "通常來說用同一把金鑰簽署及加密並不是個好主意.\n"
 #~ "這個演算法應該祇被用於特定的情況下.\n"
 #~ "請先聯絡你的安全專家."
+
 #~ msgid "Enter the size of the key"
 #~ msgstr "請輸入金鑰尺寸"
+
 #~ msgid "Answer \"yes\" or \"no\""
 #~ msgstr "請回答 \"yes\" 或 \"no\""
+
 #~ msgid ""
 #~ "Enter the required value as shown in the prompt.\n"
 #~ "It is possible to enter a ISO date (YYYY-MM-DD) but you won't\n"
@@ -8875,12 +8495,16 @@ msgstr ""
 #~ "請輸入提示裡所要求的數值.\n"
 #~ "你可以輸入 ISO 日期格式 (YYYY-MM-DD), 但是不會得到良好的錯誤回應 -\n"
 #~ "反之, 系統會試著把給定的數值中斷成若干片段."
+
 #~ msgid "Enter the name of the key holder"
 #~ msgstr "請輸入金鑰持有人的名字"
+
 #~ msgid "please enter an optional but highly suggested email address"
 #~ msgstr "請輸入選用 (但強烈建議使用) 的電子郵件位址"
+
 #~ msgid "Please enter an optional comment"
 #~ msgstr "請輸入選用的註釋"
+
 #~ msgid ""
 #~ "N  to change the name.\n"
 #~ "C  to change the comment.\n"
@@ -8893,9 +8517,11 @@ msgstr ""
 #~ "E  修改電子郵件位址.\n"
 #~ "O  繼續產生金鑰.\n"
 #~ "Q  中止產生金鑰."
+
 #~ msgid ""
 #~ "Answer \"yes\" (or just \"y\") if it is okay to generate the sub key."
 #~ msgstr "如果你覺得可以產生子鑰的話, 就回答 \"yes\" (或者祇 \"y\" 就好)."
+
 #~ msgid ""
 #~ "When you sign a user ID on a key, you should first verify that the key\n"
 #~ "belongs to the person named in the user ID.  It is useful for others to\n"
@@ -8967,16 +8593,20 @@ msgstr ""
 #~ "甚麼是 \"漫不經心\", 而甚麼是 \"超級謹慎\".\n"
 #~ "\n"
 #~ "如果你不知道應該選甚麼答案的話, 就選 \"0\"."
+
 #~ msgid "Answer \"yes\" if you want to sign ALL the user IDs"
 #~ msgstr "如果你想要簽署 *所有* 使用者 ID 的話就回答 \"yes\""
+
 #~ msgid ""
 #~ "Answer \"yes\" if you really want to delete this user ID.\n"
 #~ "All certificates are then also lost!"
 #~ msgstr ""
 #~ "如果你真的想要刪除這個使用者 ID 的話就回答 \"yes\".\n"
 #~ "所有的憑證在那之後也都會失去!"
+
 #~ msgid "Answer \"yes\" if it is okay to delete the subkey"
 #~ msgstr "如果可以刪除這把子鑰的話就回答 \"yes\""
+
 #~ msgid ""
 #~ "This is a valid signature on the key; you normally don't want\n"
 #~ "to delete this signature because it may be important to establish a\n"
@@ -8985,6 +8615,7 @@ msgstr ""
 #~ "這是一份在這把金鑰上的有效簽章; 通常你不會想要刪除這份簽章,\n"
 #~ "因為要跟這把金鑰或其他由這把金鑰所驗證的金鑰建立起信任連結\n"
 #~ "時, 會相當重要."
+
 #~ msgid ""
 #~ "This signature can't be checked because you don't have the\n"
 #~ "corresponding key.  You should postpone its deletion until you\n"
@@ -8994,10 +8625,12 @@ msgstr ""
 #~ "這份簽章無法被檢驗, 因為你沒有符合的金鑰. 你應該延緩刪除它,\n"
 #~ "直到你知道哪一把金鑰被使用了; 因為這把來簽署的金鑰可能透過\n"
 #~ "其他已經驗證的金鑰建立了一個信任連結."
+
 #~ msgid ""
 #~ "The signature is not valid.  It does make sense to remove it from\n"
 #~ "your keyring."
 #~ msgstr "這份簽章無效. 從你的鑰匙圈中將它移除相當合理."
+
 #~ msgid ""
 #~ "This is a signature which binds the user ID to the key. It is\n"
 #~ "usually not a good idea to remove such a signature.  Actually\n"
@@ -9010,6 +8643,7 @@ msgstr ""
 #~ "可能從此就不能再使用這把金鑰了. 所以祇有在這\n"
 #~ "把金鑰的第一個自我簽章因某些原因無效, 而第二\n"
 #~ "個還可用的情況下纔這麼做."
+
 #~ msgid ""
 #~ "Change the preferences of all user IDs (or just of the selected ones)\n"
 #~ "to the current list of preferences.  The timestamp of all affected\n"
@@ -9017,19 +8651,24 @@ msgstr ""
 #~ msgstr ""
 #~ "變更所有 (或祇有被選取的那幾個) 使用者 ID 的偏好成現用的偏好清單.\n"
 #~ "所有受到影響的自我簽章的時間戳記都會增加一秒鐘.\n"
+
 #~ msgid ""
 #~ "Please repeat the last passphrase, so you are sure what you typed in."
 #~ msgstr "請再次輸入最後的密語, 以確定你到底鍵入了些甚麼."
+
 #~ msgid "Give the name of the file to which the signature applies"
 #~ msgstr "請給定簽章所要套用的檔案名稱"
+
 #~ msgid "Answer \"yes\" if it is okay to overwrite the file"
 #~ msgstr "如果可以覆寫這個檔案的話就回答 \"yes\""
+
 #~ msgid ""
 #~ "Please enter a new filename. If you just hit RETURN the default\n"
 #~ "file (which is shown in brackets) will be used."
 #~ msgstr ""
 #~ "請輸入一個新的檔名. 如果你直接按下 Enter, 那麼就\n"
 #~ "會使用預設的檔案 (顯示在括號中)."
+
 #~ msgid ""
 #~ "You should specify a reason for the certification.  Depending on the\n"
 #~ "context you have the ability to choose from this list:\n"
@@ -9056,6 +8695,7 @@ msgstr ""
 #~ "  \"使用者 ID 不再有效了\"\n"
 #~ "      如果這個使用者 ID 不再被使用了, 就選這個;\n"
 #~ "      這通常用來表示某個電子郵件位址不再有效了.\n"
+
 #~ msgid ""
 #~ "If you like, you can enter a text describing why you issue this\n"
 #~ "revocation certificate.  Please keep this text concise.\n"
@@ -9064,127 +8704,187 @@ msgstr ""
 #~ "你也可以輸入一串文字來描述為甚麼發佈這份撤銷憑證的理由.\n"
 #~ "請讓這段文字保持簡明扼要.\n"
 #~ "用空白列來結束這段文字.\n"
+
 #~ msgid "         algorithms on these user IDs:\n"
 #~ msgstr "         無法使用:\n"
+
 #~ msgid "can't query passphrase in batch mode\n"
 #~ msgstr "無法在批次模式中查詢密語\n"
+
 #~ msgid "Enter passphrase: "
 #~ msgstr "請輸入密語: "
+
 #~ msgid "Repeat passphrase: "
 #~ msgstr "請再輸入一次密語: "
+
 #~ msgid "no photo viewer set\n"
 #~ msgstr "沒有設定照片檢視程式\n"
+
 #~ msgid "general error"
 #~ msgstr "一般性錯誤"
+
 #~ msgid "unknown packet type"
 #~ msgstr "未知的封包型態"
+
 #~ msgid "unknown pubkey algorithm"
 #~ msgstr "未知的公鑰演算法"
+
 #~ msgid "unknown digest algorithm"
 #~ msgstr "未知的摘要演算法"
+
 #~ msgid "bad public key"
 #~ msgstr "損壞的公鑰"
+
 #~ msgid "bad secret key"
 #~ msgstr "損壞的私鑰"
+
 #~ msgid "bad signature"
 #~ msgstr "損壞的簽章"
+
 #~ msgid "checksum error"
 #~ msgstr "加總檢查錯誤"
+
 #~ msgid "can't open the keyring"
 #~ msgstr "沒辦法開啟鑰匙圈"
+
 #~ msgid "invalid packet"
 #~ msgstr "無效的封包"
+
 #~ msgid "invalid armor"
 #~ msgstr "無效的封裝"
+
 #~ msgid "no such user id"
 #~ msgstr "沒有這個使用者 ID"
+
 #~ msgid "wrong secret key used"
 #~ msgstr "用了錯誤的私鑰"
+
 #~ msgid "not supported"
 #~ msgstr "未支援"
+
 #~ msgid "bad key"
 #~ msgstr "損壞的金鑰"
+
 #~ msgid "file write error"
 #~ msgstr "檔案寫入錯誤"
+
 #~ msgid "file open error"
 #~ msgstr "檔案開啟錯誤"
+
 #~ msgid "file create error"
 #~ msgstr "檔案建立錯誤"
+
 #~ msgid "invalid passphrase"
 #~ msgstr "無效的密語"
+
 #~ msgid "unimplemented pubkey algorithm"
 #~ msgstr "尚未實做的公鑰演算法"
+
 #~ msgid "unimplemented cipher algorithm"
 #~ msgstr "尚未實做的編密演算法"
+
 #~ msgid "unknown signature class"
 #~ msgstr "未知的簽章層級"
+
 #~ msgid "trust database error"
 #~ msgstr "信任資料庫錯誤"
+
 #~ msgid "resource limit"
 #~ msgstr "資源限制"
+
 #~ msgid "invalid keyring"
 #~ msgstr "無效的鑰匙圈"
+
 #~ msgid "malformed user id"
 #~ msgstr "變造過的使用者 ID"
+
 #~ msgid "file close error"
 #~ msgstr "檔案關閉錯誤"
+
 #~ msgid "file rename error"
 #~ msgstr "檔案更名錯誤"
+
 #~ msgid "file delete error"
 #~ msgstr "檔案刪除錯誤"
+
 #~ msgid "unexpected data"
 #~ msgstr "未預期的資料"
+
 #~ msgid "timestamp conflict"
 #~ msgstr "時間戳印有矛盾"
+
 #~ msgid "unusable pubkey algorithm"
 #~ msgstr "無法使用的公鑰演算法"
+
 #~ msgid "file exists"
 #~ msgstr "檔案已存在"
+
 #~ msgid "weak key"
 #~ msgstr "金鑰薄弱"
+
 #~ msgid "bad URI"
 #~ msgstr "損壞的 URI"
+
 #~ msgid "unsupported URI"
 #~ msgstr "未支援的 URI"
+
 #~ msgid "network error"
 #~ msgstr "網路錯誤"
+
 #~ msgid "not processed"
 #~ msgstr "未處理"
+
 #~ msgid "unusable public key"
 #~ msgstr "不可用的公鑰"
+
 #~ msgid "unusable secret key"
 #~ msgstr "不可用的私鑰"
+
 #~ msgid "keyserver error"
 #~ msgstr "金鑰伺服器錯誤"
+
 #~ msgid "no card"
 #~ msgstr "沒有卡片"
+
 #~ msgid "no data"
 #~ msgstr "沒有資料"
+
 #~ msgid "ERROR: "
 #~ msgstr "錯誤: "
+
 #~ msgid "WARNING: "
 #~ msgstr "警告: "
+
 #~ msgid "... this is a bug (%s:%d:%s)\n"
 #~ msgstr "... 這是個瑕疵 (%s:%d:%s)\n"
+
 #~ msgid "WARNING: using insecure memory!\n"
 #~ msgstr "警告: 正在使用不安全的記憶體!\n"
+
 #~ msgid "please see http://www.gnupg.org/faq.html for more information\n"
 #~ msgstr "請參考 http://www.gnupg.org/faq.html 上進一步的資訊\n"
+
 #~ msgid "operation is not possible without initialized secure memory\n"
 #~ msgstr "尚未啟用安全的記憶體時, 不可能進行操作\n"
+
 #~ msgid "(you may have used the wrong program for this task)\n"
 #~ msgstr "(也許你選錯程式來做這件事了)\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入標記資料\n"
+
 #~ msgid "can't put notation data into v3 (PGP 2.x style) key signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入標記資料\n"
+
 #~ msgid "can't put a policy URL into v3 (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的簽章內放入原則 URL\n"
+
 #~ msgid "can't put a policy URL into v3 key (PGP 2.x style) signatures\n"
 #~ msgstr "無法在 v3 (PGP 2.x 型態) 的金鑰簽章內放入原則 URL\n"
+
 #~ msgid ""
 #~ "please see http://www.gnupg.org/why-not-idea.html for more information\n"
 #~ msgstr "請參考 http://www.gnupg.org/why-not-idea.html 取得更多資訊\n"
+
 #~ msgid "DSA requires the use of a 160 bit hash algorithm\n"
 #~ msgstr "DSA 要求使用 160 位元的雜湊演算法\n"
-
author	Werner Koch <[email protected]>	2010-07-19 07:05:30 +0000
committer	Werner Koch <[email protected]>	2010-07-19 07:05:30 +0000
commit	ec45cd2d20f96d5142c68669e2e620321b774876 (patch)
tree	2d39b87132bd3e644bd61a79b6c9f520638b6c91
parent	Backport bug fix. Fixes bug#1240. (diff)
download	gnupg-ec45cd2d20f96d5142c68669e2e620321b774876.tar.gz gnupg-ec45cd2d20f96d5142c68669e2e620321b774876.zip